summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Redondo <qt@david-redondo.de>2024-03-05 13:10:52 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2024-03-06 17:16:23 +0000
commite9431e34a4fd4909e9704b95aeec35f64dc6a09d (patch)
tree571f1043dea0230b92338ebd47a417265d48d7b1
parentbe274b52838a75f557eda38c3fb37c8063c52cbe (diff)
Map drag event positions to global during dock/toolbar drag
Drag event positions are window relatives, QMainWindowLayout::hover expects global coordinates however. Fixes: QTBUG-122949 Change-Id: I28469ba1b5ef88661e744d4cf87f6acab3eb2c72 Reviewed-by: David Edmundson <davidedmundson@kde.org> Reviewed-by: Axel Spoerl <axel.spoerl@qt.io> (cherry picked from commit 986de654b8c3af57af6f76581e50ff9e54c98b20) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 2bc6b25c5655e17f65a3a7fd84ba38f203f5cf4a)
-rw-r--r--src/widgets/widgets/qmainwindow.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/widgets/widgets/qmainwindow.cpp b/src/widgets/widgets/qmainwindow.cpp
index 85353d9b4e..4534058d45 100644
--- a/src/widgets/widgets/qmainwindow.cpp
+++ b/src/widgets/widgets/qmainwindow.cpp
@@ -1296,7 +1296,8 @@ bool QMainWindow::event(QEvent *event)
if (!d->layout->draggingWidget)
break;
auto dragMoveEvent = static_cast<QDragMoveEvent *>(event);
- d->layout->hover(d->layout->draggingWidget, dragMoveEvent->position().toPoint());
+ d->layout->hover(d->layout->draggingWidget,
+ mapToGlobal(dragMoveEvent->position()).toPoint());
event->accept();
return true;
}