void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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(); nowSession->updates().updateOnline();
} }
} }
if (_mediaView if (_mediaView && _mediaView->takeFocusFrom(now->widget())) {
&& !_mediaView->isHidden()
&& !_mediaView->isMinimized()
&& _mediaView->isFullScreen()) {
_mediaView->activate(); _mediaView->activate();
} }
} }

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

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

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

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