From 3251b8bf6e740e55777e85d63065a61e43df54fe Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sun, 31 Jan 2021 12:34:35 +0400 Subject: [PATCH] Don't set geometry for media viewer only on Wayland --- .../media/view/media_view_overlay_widget.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp index 75fff52f4b..f16fde906d 100644 --- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp +++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp @@ -450,15 +450,13 @@ void OverlayWidget::moveToScreen() { .arg(screenList.indexOf(activeWindowScreen))); windowHandle()->setScreen(activeWindowScreen); DEBUG_LOG(("Viewer Pos: New actual screen: %1") - .arg(windowHandle() - ? screenList.indexOf(windowHandle()->screen()) - : -2)); + .arg(screenList.indexOf(windowHandle()->screen()))); } updateGeometry(); } void OverlayWidget::updateGeometry() { - if (Platform::IsLinux()) { + if (Platform::IsWayland()) { return; } const auto screen = windowHandle() && windowHandle()->screen() @@ -1323,9 +1321,7 @@ void OverlayWidget::handleVisibleChanged(bool visible) { if (visible) { const auto screenList = QGuiApplication::screens(); DEBUG_LOG(("Viewer Pos: Shown, screen number: %1") - .arg(windowHandle() - ? screenList.indexOf(windowHandle()->screen()) - : -2)); + .arg(screenList.indexOf(windowHandle()->screen()))); moveToScreen(); }