MrBesen/tdesktop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't steal window focus to viewer on another screen.

Browse Source
This commit is contained in:
John Preston 2023-02-18 15:16:06 +04:00
parent 18ebaeb726
commit 137c13c9c0
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Telegram/SourceFiles/core/application.cpp
View File

@ -1490,10 +1490,7 @@ void Application::windowActivated(not_null<Window::Controller*> window) {
nowSession->updates().updateOnline();
}
}
if (_mediaView
&& !_mediaView->isHidden()
&& !_mediaView->isMinimized()
&& _mediaView->isFullScreen()) {
if (_mediaView && _mediaView->takeFocusFrom(now->widget())) {
_mediaView->activate();
}
}

7
Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
View File

@ -2741,6 +2741,13 @@ void OverlayWidget::setFocus() {
_widget->setFocus();
}
bool OverlayWidget::takeFocusFrom(not_null<QWidget*> window) const {
return _fullscreen
&& !isHidden()
&& !isMinimized()
&& (_window->screen() == window->screen());
}
void OverlayWidget::activate() {
_window->raise();
_window->activateWindow();

1
Telegram/SourceFiles/media/view/media_view_overlay_widget.h
View File

@ -88,6 +88,7 @@ public:
void hide();
void setCursor(style::cursor cursor);
void setFocus();
[[nodiscard]] bool takeFocusFrom(not_null<QWidget*> window) const;
void activate();
void show(OpenRequest request);