Deliver QNativeGestureEvent via deliverSinglePointEventUntilAccepted

This just simplifies the code a little, and also enables event
filtering during delivery to Items.

Change-Id: I407dc9a19207f977b574f2a92f5da892e8752987
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>

4 files changed, 21 insertions, 49 deletions

diff --git a/src/quick/items/qquickevents.cpp b/src/quick/items/qquickevents.cpp
index fc25de38b1..1f10afcc08 100644
--- a/src/quick/items/qquickevents.cpp
+++ b/src/quick/items/qquickevents.cpp
@@ -642,6 +642,11 @@ QQuickPointerDevice *QQuickPointerDevice::touchDevice(const QTouchDevice *d)
     return dev;
 }
 
+const QTouchDevice *QQuickPointerDevice::qTouchDevice() const
+{
+    return g_touchDevices->key(const_cast<QQuickPointerDevice *>(this));
+}
+
 QList<QQuickPointerDevice*> QQuickPointerDevice::touchDevices()
 {
     return g_touchDevices->values();
diff --git a/src/quick/items/qquickevents_p_p.h b/src/quick/items/qquickevents_p_p.h
index 2439193ef1..c67c386676 100644
--- a/src/quick/items/qquickevents_p_p.h
+++ b/src/quick/items/qquickevents_p_p.h
@@ -672,6 +672,7 @@ public:
     int buttonCount() const { return m_buttonCount; }
     QString name() const { return m_name; }
     QPointingDeviceUniqueId uniqueId() const { return m_uniqueId; }
+    const QTouchDevice *qTouchDevice() const;
 
     static QQuickPointerDevice *touchDevice(const QTouchDevice *d);
     static QList<QQuickPointerDevice *> touchDevices();
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index 9d6c972e40..a8785136cb 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -89,6 +89,7 @@ Q_LOGGING_CATEGORY(DBG_TOUCH_TARGET, "qt.quick.touch.target")
 Q_LOGGING_CATEGORY(DBG_MOUSE, "qt.quick.mouse")
 Q_LOGGING_CATEGORY(DBG_MOUSE_TARGET, "qt.quick.mouse.target")
 Q_LOGGING_CATEGORY(lcWheelTarget, "qt.quick.wheel.target")
+Q_LOGGING_CATEGORY(lcGestureTarget, "qt.quick.gesture.target")
 Q_LOGGING_CATEGORY(DBG_HOVER_TRACE, "qt.quick.hover.trace")
 Q_LOGGING_CATEGORY(DBG_FOCUS, "qt.quick.focus")
 Q_LOGGING_CATEGORY(DBG_DIRTY, "qt.quick.dirty")
@@ -1625,8 +1626,7 @@ bool QQuickWindow::event(QEvent *e)
     }
 #if QT_CONFIG(gestures)
     case QEvent::NativeGesture:
-        if (d->contentItem)
-            d->deliverNativeGestureEvent(d->contentItem, static_cast<QNativeGestureEvent*>(e));
+        d->deliverSinglePointEventUntilAccepted(d->pointerEventInstance(e));
         break;
 #endif
     case QEvent::ShortcutOverride:
@@ -1927,6 +1927,19 @@ bool QQuickWindowPrivate::deliverSinglePointEventUntilAccepted(QQuickPointerEven
             }
         }
 #endif
+#if QT_CONFIG(gestures)
+        if (QQuickPointerNativeGestureEvent *pnge = event->asPointerNativeGestureEvent()) {
+            QNativeGestureEvent nge(pnge->type(), pnge->device()->qTouchDevice(), point->position(), point->scenePosition(), g,
+                                    pnge->value(), 0L, 0L); // TODO can't copy things I can't access
+            nge.accept();
+            QCoreApplication::sendEvent(item, &nge);
+            if (nge.isAccepted()) {
+                qCDebug(lcGestureTarget) << &nge << "->" << item;
+                event->setAccepted(true);
+                return true;
+            }
+        }
+#endif // gestures
     }
 
     return false; // it wasn't handled
@@ -1952,50 +1965,6 @@ void QQuickWindow::wheelEvent(QWheelEvent *event)
 }
 #endif // wheelevent
 
-#if QT_CONFIG(gestures)
-bool QQuickWindowPrivate::deliverNativeGestureEvent(QQuickItem *item, QNativeGestureEvent *event)
-{
-    QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(item);
-
-    QPointF p = item->mapFromScene(event->windowPos());
-    if ((itemPrivate->flags & QQuickItem::ItemClipsChildrenToShape) && !item->contains(p))
-        return false;
-
-    QList<QQuickItem *> children = itemPrivate->paintOrderChildItems();
-    for (int ii = children.count() - 1; ii >= 0; --ii) {
-        QQuickItem *child = children.at(ii);
-        if (!child->isVisible() || !child->isEnabled() || QQuickItemPrivate::get(child)->culled)
-            continue;
-        if (deliverNativeGestureEvent(child, event))
-            return true;
-    }
-
-    // Try the Item's pointer handlers first
-    QQuickPointerEvent *pointerEvent = pointerEventInstance(event);
-    pointerEvent->localize(item);
-    if (itemPrivate->handlePointerEvent(pointerEvent, false)) {
-        if (pointerEvent->allPointsAccepted()) {
-            event->accept();
-            return true;
-        }
-    }
-
-    // If still not accepted, try direct delivery to the item
-    if (item->contains(p)) {
-        QNativeGestureEvent copy(event->gestureType(), event->device(), p, event->windowPos(), event->screenPos(),
-                                 event->value(), 0L, 0L); // TODO can't copy things I can't access
-        event->accept();
-        item->event(&copy);
-        if (copy.isAccepted()) {
-            event->accept();
-            return true;
-        }
-    }
-
-    return false;
-}
-#endif // gestures
-
 bool QQuickWindowPrivate::deliverTouchCancelEvent(QTouchEvent *event)
 {
     qCDebug(DBG_TOUCH) << event;
diff --git a/src/quick/items/qquickwindow_p.h b/src/quick/items/qquickwindow_p.h
index a60ff3c2c9..eb2f4d20fa 100644
--- a/src/quick/items/qquickwindow_p.h
+++ b/src/quick/items/qquickwindow_p.h
@@ -153,9 +153,6 @@ public:
     bool sendFilteredPointerEvent(QQuickPointerEvent *event, QQuickItem *receiver, QQuickItem *filteringParent = nullptr);
     bool sendFilteredPointerEventImpl(QQuickPointerEvent *event, QQuickItem *receiver, QQuickItem *filteringParent);
     bool deliverSinglePointEventUntilAccepted(QQuickPointerEvent *);
-#if QT_CONFIG(gestures)
-    bool deliverNativeGestureEvent(QQuickItem *, QNativeGestureEvent *);
-#endif
 
     // entry point of events to the window
     void handleTouchEvent(QTouchEvent *);