From daa3a2f62ff56fd4d542c56ed02264b7334bf13a Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Mon, 4 Jan 2021 16:37:38 +0400 Subject: [PATCH] React to resizeEvent in media viewer --- .../SourceFiles/media/view/media_view_overlay_widget.cpp | 8 +++----- .../SourceFiles/media/view/media_view_overlay_widget.h | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp index a32bd82e77..edc46ebb75 100644 --- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp +++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp @@ -446,11 +446,7 @@ void OverlayWidget::moveToScreen() { : nullptr; const auto activeWindowScreen = widgetScreen(window); const auto myScreen = widgetScreen(this); - // Wayland doesn't support positioning, but Qt emits screenChanged anyway - // and geometry of the widget become broken - if (activeWindowScreen - && myScreen != activeWindowScreen - && !Platform::IsWayland()) { + if (activeWindowScreen && myScreen != activeWindowScreen) { windowHandle()->setScreen(activeWindowScreen); } updateGeometry(); @@ -465,7 +461,9 @@ void OverlayWidget::updateGeometry() { return; } setGeometry(available); +} +void OverlayWidget::resizeEvent(QResizeEvent *e) { auto navSkip = 2 * st::mediaviewControlMargin + st::mediaviewControlSize; _closeNav = myrtlrect(width() - st::mediaviewControlMargin - st::mediaviewControlSize, st::mediaviewControlMargin, st::mediaviewControlSize, st::mediaviewControlSize); _closeNavIcon = style::centerrect(_closeNav, st::mediaviewClose); diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h index 3879d04ad9..9cab8f0f2e 100644 --- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h +++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h @@ -166,6 +166,7 @@ private: }; void paintEvent(QPaintEvent *e) override; + void resizeEvent(QResizeEvent *e) override; void keyPressEvent(QKeyEvent *e) override; void wheelEvent(QWheelEvent *e) override;