diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2016-08-02 15:18:19 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2016-08-03 15:31:07 +0000 |
| commit | 965f951988e437dddb3f2d048877d3e68777db96 (patch) | |
| tree | 1ec4dc79daeb607628d7280d98cc600d8576ac0f /src/quick/items/qquickevents.cpp | |
| parent | 53cc9a9df9f94912df5afe64f235b0525e33603a (diff) | |
Pass pointer event into sendFilteredTouchEvent
Change-Id: Id8709b45af135df5f16558c4b611409bc134ea63
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/quick/items/qquickevents.cpp')
| -rw-r--r-- | src/quick/items/qquickevents.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquickevents.cpp b/src/quick/items/qquickevents.cpp index cfc35efbb4..69df946d6f 100644 --- a/src/quick/items/qquickevents.cpp +++ b/src/quick/items/qquickevents.cpp @@ -791,7 +791,7 @@ const QTouchEvent::TouchPoint *QQuickPointerTouchEvent::touchPointById(int point Returns a nullptr if all points are stationary or there are no points inside the item. */ -QTouchEvent *QQuickPointerTouchEvent::touchEventForItem(QQuickItem *item) const +QTouchEvent *QQuickPointerTouchEvent::touchEventForItem(QQuickItem *item, bool isFiltering) const { QList<QTouchEvent::TouchPoint> touchPoints; Qt::TouchPointStates eventStates; @@ -806,7 +806,7 @@ QTouchEvent *QQuickPointerTouchEvent::touchEventForItem(QQuickItem *item) const continue; bool isGrabber = p->grabber() == item; bool isPressInside = p->state() == Qt::TouchPointPressed && item->contains(item->mapFromScene(p->scenePos())); - if (!(isGrabber || isPressInside)) + if (!(isGrabber || isPressInside || isFiltering)) continue; const QTouchEvent::TouchPoint *tp = touchPointById(p->pointId()); |