Pass PointerEvent into deliverMouseEvent

Change-Id: Ib9e1748cea24851ecc369da5d658654341d291ac
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>

2 files changed, 7 insertions, 8 deletions

diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index 378b21c8cc..c1167ad8a5 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -1647,14 +1647,14 @@ bool QQuickWindowPrivate::deliverInitialMousePressEvent(QMouseEvent *event)
     return false;
 }
 
-void QQuickWindowPrivate::deliverMouseEvent(QMouseEvent *event)
+void QQuickWindowPrivate::deliverMouseEvent(QQuickPointerMouseEvent *pointerEvent)
 {
     Q_Q(QQuickWindow);
+    auto event = pointerEvent->asMouseEvent();
 
-    lastMousePosition = event->windowPos();
+    lastMousePosition = pointerEvent->point(0)->scenePos();
 
     QQuickItem *mouseGrabberItem = q->mouseGrabberItem();
-
     if (mouseGrabberItem) {
         // send update
         QPointF localPos = mouseGrabberItem->mapFromScene(event->windowPos());
@@ -1669,8 +1669,7 @@ void QQuickWindowPrivate::deliverMouseEvent(QMouseEvent *event)
     } else {
         // send initial press
         event->setAccepted(false);
-        if ((event->type() == QEvent::MouseButtonPress || event->type() == QEvent::MouseButtonDblClick) &&
-                (event->buttons() & event->button()) == event->buttons()) {
+        if (pointerEvent->isPressEvent()) {
             bool delivered = deliverInitialMousePressEvent(event);
             event->setAccepted(delivered);
         }
@@ -2129,8 +2128,8 @@ void QQuickWindowPrivate::deliverPointerEvent(QQuickPointerEvent *event)
     // the usecase a bit evil, but we at least don't want to lose events.
     ++pointerEventRecursionGuard;
 
-    if (QQuickPointerMouseEvent *mouse = event->asPointerMouseEvent()) {
-        deliverMouseEvent(mouse->asMouseEvent());
+    if (event->asPointerMouseEvent()) {
+        deliverMouseEvent(event->asPointerMouseEvent());
     } else if (event->asPointerTouchEvent()) {
         deliverTouchEvent(event->asPointerTouchEvent());
     } else {
diff --git a/src/quick/items/qquickwindow_p.h b/src/quick/items/qquickwindow_p.h
index e5492cf031..61d57692a7 100644
--- a/src/quick/items/qquickwindow_p.h
+++ b/src/quick/items/qquickwindow_p.h
@@ -146,7 +146,7 @@ public:
     static void transformTouchPoints(QList<QTouchEvent::TouchPoint> &touchPoints, const QTransform &transform);
     static QMouseEvent *cloneMouseEvent(QMouseEvent *event, QPointF *transformedLocalPos = 0);
     bool deliverInitialMousePressEvent(QMouseEvent *);
-    void deliverMouseEvent(QMouseEvent *);
+    void deliverMouseEvent(QQuickPointerMouseEvent *pointerEvent);
     bool sendFilteredMouseEvent(QQuickItem *, QQuickItem *, QEvent *, QSet<QQuickItem *> *);
 #ifndef QT_NO_WHEELEVENT
     bool deliverWheelEvent(QQuickItem *, QWheelEvent *);