From 78a666a19d30fc158647599da1a6e8b00f581a60 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sat, 12 Dec 2020 13:09:03 +0400 Subject: [PATCH] Make updateGeometry don't need the argument --- .../media/view/media_view_overlay_widget.cpp | 18 +++++++++--------- .../media/view/media_view_overlay_widget.h | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp index 31dcd584ad..f9f620ac24 100644 --- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp +++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp @@ -359,7 +359,7 @@ OverlayWidget::OverlayWidget() } else { setWindowFlags(Qt::FramelessWindowHint); } - updateGeometry(QApplication::primaryScreen()->geometry()); + updateGeometry(); setAttribute(Qt::WA_NoSystemBackground, true); setAttribute(Qt::WA_TranslucentBackground, true); setMouseTracking(true); @@ -453,8 +453,11 @@ void OverlayWidget::moveToScreen() { } } -void OverlayWidget::updateGeometry(const QRect &rect) { - setGeometry(rect); +void OverlayWidget::updateGeometry() { + const auto screen = windowHandle() && windowHandle()->screen() + ? windowHandle()->screen() + : QApplication::primaryScreen(); + setGeometry(screen->geometry()); auto navSkip = 2 * st::mediaviewControlMargin + st::mediaviewControlSize; _closeNav = myrtlrect(width() - st::mediaviewControlMargin - st::mediaviewControlSize, st::mediaviewControlMargin, st::mediaviewControlSize, st::mediaviewControlSize); @@ -1313,21 +1316,18 @@ void OverlayWidget::onScreenResized(int screen) { && windowHandle()->screen() && changed && windowHandle()->screen() == changed) { - updateGeometry(changed->geometry()); + updateGeometry(); } } void OverlayWidget::handleVisibleChanged(bool visible) { if (visible) { - const auto screen = windowHandle()->screen() - ? windowHandle()->screen() - : QApplication::primaryScreen(); - updateGeometry(screen->geometry()); + updateGeometry(); } } void OverlayWidget::handleScreenChanged(QScreen *screen) { - updateGeometry(screen->geometry()); + updateGeometry(); } void OverlayWidget::onToMessage() { diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h index 88e0b663ed..3879d04ad9 100644 --- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h +++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h @@ -209,10 +209,10 @@ private: void updateOver(QPoint mpos); void moveToScreen(); + void updateGeometry(); bool moveToNext(int delta); void preloadData(int delta); - void updateGeometry(const QRect &rect); void handleVisibleChanged(bool visible); void handleScreenChanged(QScreen *screen);