From d8cc7a9b50dc36abc818533ea56034f69d634c75 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Wed, 1 Jul 2020 18:28:33 +0400 Subject: [PATCH] Pass Qt::Edges to updateCursor and startResize --- Telegram/SourceFiles/window/window_title_qt.cpp | 13 ++++++------- Telegram/SourceFiles/window/window_title_qt.h | 4 ++-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Telegram/SourceFiles/window/window_title_qt.cpp b/Telegram/SourceFiles/window/window_title_qt.cpp index 92dd3d9daf..e9417d03cb 100644 --- a/Telegram/SourceFiles/window/window_title_qt.cpp +++ b/Telegram/SourceFiles/window/window_title_qt.cpp @@ -105,15 +105,16 @@ bool TitleWidgetQt::eventFilter(QObject *obj, QEvent *e) { || e->type() == QEvent::MouseButtonPress) { if(window()->isAncestorOf(static_cast(obj))) { const auto mouseEvent = static_cast(e); + const auto edges = edgesFromPos(mouseEvent->windowPos().toPoint()); if (e->type() == QEvent::MouseMove) { - updateCursor(mouseEvent->windowPos().toPoint()); + updateCursor(edges); } if(e->type() == QEvent::MouseButtonPress && mouseEvent->button() == Qt::LeftButton && window()->windowState() != Qt::WindowMaximized) { - return startResize(mouseEvent->windowPos().toPoint()); + return startResize(edges); } } } else if (e->type() == QEvent::Leave) { @@ -195,9 +196,7 @@ Qt::Edges TitleWidgetQt::edgesFromPos(const QPoint &pos) { } } -void TitleWidgetQt::updateCursor(const QPoint &pos) { - const auto edges = edgesFromPos(pos); - +void TitleWidgetQt::updateCursor(Qt::Edges edges) { if (!edges || window()->windowState() == Qt::WindowMaximized) { while (QGuiApplication::overrideCursor()) { QGuiApplication::restoreOverrideCursor(); @@ -221,9 +220,9 @@ void TitleWidgetQt::updateCursor(const QPoint &pos) { } } -bool TitleWidgetQt::startResize(const QPoint &pos) { +bool TitleWidgetQt::startResize(Qt::Edges edges) { #if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) || defined DESKTOP_APP_QT_PATCHED - if (const auto edges = edgesFromPos(pos)) { + if (edges) { return window()->windowHandle()->startSystemResize(edges); } #endif // Qt >= 5.15 || DESKTOP_APP_QT_PATCHED diff --git a/Telegram/SourceFiles/window/window_title_qt.h b/Telegram/SourceFiles/window/window_title_qt.h index 31a84a9b0e..68d4dcbce4 100644 --- a/Telegram/SourceFiles/window/window_title_qt.h +++ b/Telegram/SourceFiles/window/window_title_qt.h @@ -41,8 +41,8 @@ private: void updateControlsPosition(); Qt::Edges edgesFromPos(const QPoint &pos); - void updateCursor(const QPoint &pos); - bool startResize(const QPoint &pos); + void updateCursor(Qt::Edges edges); + bool startResize(Qt::Edges edges); const style::WindowTitle &_st; object_ptr _minimize;