Fix QQuickPopupPrivate::handleMouseEvent()

Touch moves are being abruptly stolen while flicking within a drawer.
Looks like there's a difference between mapping mouse events to scene
vs. using the window coordinates. All other places in the overlay and
popups are using window coordinates, so sync with that to ensure that
"drag over threshold" calculations are done based on press and move
coordinates that are in the same coordinate space.

Task-number: QTBUG-60521
Change-Id: Ied94870fe68a7e5da65b75d3daa585db6e5e9560
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

1 files changed, 3 insertions, 4 deletions

diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp
index 024890ab..aee013e3 100644
--- a/src/quicktemplates2/qquickpopup.cpp
+++ b/src/quicktemplates2/qquickpopup.cpp
@@ -360,14 +360,13 @@ void QQuickPopupPrivate::handleUngrab()
 
 bool QQuickPopupPrivate::handleMouseEvent(QQuickItem *item, QMouseEvent *event)
 {
-    QPointF pos = item->mapToScene(event->localPos());
     switch (event->type()) {
     case QEvent::MouseButtonPress:
-        return handlePress(item, pos, event->timestamp());
+        return handlePress(item, event->windowPos(), event->timestamp());
     case QEvent::MouseMove:
-        return handleMove(item, pos, event->timestamp());
+        return handleMove(item, event->windowPos(), event->timestamp());
     case QEvent::MouseButtonRelease:
-        return handleRelease(item, pos, event->timestamp());
+        return handleRelease(item, event->windowPos(), event->timestamp());
     default:
         Q_UNREACHABLE();
         return false;