fix system menu wrong position

Signed-off-by: Yuhang Zhao <zhaoyuhang@rankyee.com>
wangwenx190 · Apr 7, 2023 · b4a27c0 · b4a27c0
1 parent b597d2c
commit b4a27c0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/quick/quickstandardtitlebar.cpp b/src/quick/quickstandardtitlebar.cpp
@@ -421,10 +421,11 @@ bool QuickStandardTitleBar::mouseEventHandler(QMouseEvent *event)
                     return;
                 }
                 FramelessQuickHelper::get(this)->showSystemMenu([this, button, &scenePos]() -> QPoint {
+                    QPoint pos = scenePos;
                     if (button == Qt::LeftButton) {
-                        return {0, int(std::round(height()))};
+                        pos = {0, int(std::round(height()))};
                     }
-                    return scenePos;
+                    return mapToGlobal(pos).toPoint();
                 }());
             });
             // Don't eat this event, we have not handled it yet.

diff --git a/src/widgets/standardtitlebar.cpp b/src/widgets/standardtitlebar.cpp
@@ -343,11 +343,12 @@ bool StandardTitleBarPrivate::mouseEventHandler(QMouseEvent *event)
                     return;
                 }
                 // Please refer to the comments in StandardTitleBarPrivate::setWindowIconVisible().
-                FramelessWidgetsHelper::get(m_window)->showSystemMenu([button, q, &scenePos]() -> QPoint {
+                FramelessWidgetsHelper::get(m_window)->showSystemMenu([button, q, &scenePos, this]() -> QPoint {
+                    QPoint pos = scenePos;
                     if (button == Qt::LeftButton) {
-                        return {0, q->height()};
+                        pos = {0, q->height()};
                     }
-                    return scenePos;
+                    return m_window->mapToGlobal(pos);
                 }());
             });
             // Don't eat this event, we have not handled it yet.