From eae73be9060b4017b3eee64ab43a5b8ecb62ab2c Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Fri, 29 Jul 2016 17:58:12 +0200 Subject: Deliver touch points in defined order [ChangeLog][QtQuick] Touch events are now delivered in a well defined order: New touch points are delivered first to items under the finger which was first touching the screen. Then to items that are under the second finger and finally to common ancestors. This means that items that are "on top" will get a chance to grab touch points before any items in the background. Change-Id: Icf9a163c0183437cdb79040b8513fd746c3a6a44 Reviewed-by: Shawn Rutledge --- src/quick/items/qquickwindow_p.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/quick/items/qquickwindow_p.h') diff --git a/src/quick/items/qquickwindow_p.h b/src/quick/items/qquickwindow_p.h index 51804653f7..cd63f5a8f6 100644 --- a/src/quick/items/qquickwindow_p.h +++ b/src/quick/items/qquickwindow_p.h @@ -167,14 +167,14 @@ public: void deliverPointerEvent(QQuickPointerEvent *); void deliverTouchEvent(QQuickPointerTouchEvent *); bool deliverTouchCancelEvent(QTouchEvent *); - bool deliverNewTouchPoints(QQuickItem *, QQuickPointerTouchEvent *, QSet *); + bool deliverNewTouchPoints(QQuickPointerTouchEvent *, QSet *); bool deliverUpdatedTouchPoints(QQuickPointerTouchEvent *event, QSet *hasFiltered); bool deliverMatchingPointsToItem(QQuickItem *item, const QQuickPointerTouchEvent *event, QSet *filtered); static QTouchEvent *touchEventForItem(QQuickItem *target, const QTouchEvent &originalEvent); static QTouchEvent *touchEventWithPoints(const QTouchEvent &event, const QList &newPoints); bool sendFilteredTouchEvent(QQuickItem *target, QQuickItem *item, QTouchEvent *event, QSet *filtered); - QVector pointerTargets(QQuickItem *, const QPointF &) const; + QVector pointerTargets(QQuickItem *, const QPointF &, bool checkMouseButtons) const; QVector mergePointerTargets(const QVector &list1, const QVector &list2) const; // hover delivery -- cgit v1.2.3