From af21677f473bce12ee7c725b1151ae794384ae76 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Tue, 7 Feb 2017 13:24:49 +0100 Subject: QQuickWindow: remove sendFilteredTouchEvent MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The functionality is now completely assimilated into sendFilteredPointerEvent. Flickable can now steal the touch grab from a TapHandler child, for example: the TapHandler grabbed the eventpoint, whereas QQuickFlickable::childMouseEventFilter() was given a synthetic mouse event derived from the touchpoint which the eventpoint represented, and we fully follow through the consequences of that. If an Item filters a press event, avoid doing normal delivery to that same Item again. Change-Id: Icd9c88ab752f2b728f7d612504013c6dc72ff9fe Reviewed-by: Jan Arve Sæther --- src/quick/items/qquickwindow_p.h | 7 +++---- 1 file changed, 3 insertions(+), 4 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 38c1b0a4d4..b0d4d1ce01 100644 --- a/src/quick/items/qquickwindow_p.h +++ b/src/quick/items/qquickwindow_p.h @@ -168,10 +168,9 @@ public: void deliverPointerEvent(QQuickPointerEvent *); void deliverTouchEvent(QQuickPointerTouchEvent *); bool deliverTouchCancelEvent(QTouchEvent *); - bool deliverPressEvent(QQuickPointerEvent *, QSet *); - bool deliverUpdatedTouchPoints(QQuickPointerTouchEvent *event, QSet *hasFiltered); - bool deliverMatchingPointsToItem(QQuickItem *item, QQuickPointerEvent *pointerEvent, QSet *filtered); - bool sendFilteredTouchEvent(QQuickItem *target, QQuickItem *item, QQuickPointerTouchEvent *event, QSet *filtered); + bool deliverPressEvent(QQuickPointerEvent *); + bool deliverUpdatedTouchPoints(QQuickPointerTouchEvent *event); + bool deliverMatchingPointsToItem(QQuickItem *item, QQuickPointerEvent *pointerEvent); QVector pointerTargets(QQuickItem *, const QPointF &, bool checkMouseButtons) const; QVector mergePointerTargets(const QVector &list1, const QVector &list2) const; -- cgit v1.2.3