diff options
Diffstat (limited to 'mediaviewer_nofullscreen.patch')
| -rw-r--r-- | mediaviewer_nofullscreen.patch | 33 |
1 files changed, 7 insertions, 26 deletions
diff --git a/mediaviewer_nofullscreen.patch b/mediaviewer_nofullscreen.patch index f644d6b5153f..a2517e86f4f2 100644 --- a/mediaviewer_nofullscreen.patch +++ b/mediaviewer_nofullscreen.patch @@ -1,37 +1,18 @@ Description: Fix un-fullscreened media viewer sizing -Reverts 3251b8bf6e740e55777e85d63065a61e43df54fe +See 3251b8bf6e740e55777e85d63065a61e43df54fe Credits: novie diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp -index 604449dd3..021b74030 100644 +index 604449dd3..799e1de14 100644 --- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp +++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp -@@ -457,13 +457,15 @@ void OverlayWidget::moveToScreen() { - .arg(screenList.indexOf(activeWindowScreen))); - windowHandle()->setScreen(activeWindowScreen); - DEBUG_LOG(("Viewer Pos: New actual screen: %1") -- .arg(screenList.indexOf(windowHandle()->screen()))); -+ .arg(windowHandle() -+ ? screenList.indexOf(windowHandle()->screen()) -+ : -2)); - } - updateGeometry(); +@@ -463,9 +463,6 @@ void OverlayWidget::moveToScreen() { } void OverlayWidget::updateGeometry() { - if (Platform::IsWayland()) { -+ if (Platform::IsLinux()) { - return; - } +- return; +- } const auto screen = windowHandle() && windowHandle()->screen() -@@ -1341,7 +1343,9 @@ void OverlayWidget::handleVisibleChanged(bool visible) { - if (visible) { - const auto screenList = QGuiApplication::screens(); - DEBUG_LOG(("Viewer Pos: Shown, screen number: %1") -- .arg(screenList.indexOf(windowHandle()->screen()))); -+ .arg(windowHandle() -+ ? screenList.indexOf(windowHandle()->screen()) -+ : -2)); - - moveToScreen(); - } + ? windowHandle()->screen() + : QApplication::primaryScreen(); |