diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2016-07-05 16:12:10 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2016-07-13 08:58:10 +0000 |
| commit | c744706be9d277bb4a265d8368b93de6da23dea2 (patch) | |
| tree | 60365544d990d44cdfde794f34c9bc981f3df634 /src/quick/items/qquickwindow_p.h | |
| parent | 1a276ab5a41fd36fa9afcd02ff61a56173821d98 (diff) | |
deliver touch events as QQuickPointerEvents
QQuickPointerEvent::touchEventForItem should replace
QQuickWindow::touchEventWithPoints, but the latter is still
called from one place. This can be fixed when we redo
parent-filtering using a presorted delivery list.
Change-Id: I350a912a9801294d4f44d3d56b53fe3be5302a60
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'src/quick/items/qquickwindow_p.h')
| -rw-r--r-- | src/quick/items/qquickwindow_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/items/qquickwindow_p.h b/src/quick/items/qquickwindow_p.h index a0e4f48330..7e75e63817 100644 --- a/src/quick/items/qquickwindow_p.h +++ b/src/quick/items/qquickwindow_p.h @@ -158,8 +158,8 @@ public: bool deliverNativeGestureEvent(QQuickItem *, QNativeGestureEvent *); #endif static QQuickPointerDevice *touchDevice(QTouchDevice *d); - bool deliverTouchPoints(QQuickItem *, QTouchEvent *, const QList<QTouchEvent::TouchPoint> &, QSet<int> *, - QHash<QQuickItem *, QList<QTouchEvent::TouchPoint> > *, QSet<QQuickItem*> *filtered); + bool deliverPoints(QQuickItem *, const QQuickPointerEvent *, const QList<const QQuickEventPoint *> &, + QSet<quint64> *, QHash<QQuickItem *, QList<const QQuickEventPoint *> > *, QSet<QQuickItem *> *); void handleTouchEvent(QTouchEvent *); void handleMouseEvent(QMouseEvent *); void deliverPointerEvent(QQuickPointerEvent *); @@ -169,7 +169,7 @@ public: void deliverDelayedTouchEvent(); void flushFrameSynchronousEvents(); bool deliverHoverEvent(QQuickItem *, const QPointF &scenePos, const QPointF &lastScenePos, Qt::KeyboardModifiers modifiers, bool &accepted); - bool deliverMatchingPointsToItem(QQuickItem *item, QTouchEvent *event, QSet<int> *acceptedNewPoints, const QSet<int> &matchingNewPoints, const QList<QTouchEvent::TouchPoint> &matchingPoints, QSet<QQuickItem*> *filtered); + bool deliverMatchingPointsToItem(QQuickItem *item, const QQuickPointerEvent *event, QSet<quint64> *acceptedNewPoints, const QSet<quint64> &matchingNewPoints, const QList<const QQuickEventPoint *> &matchingPoints, QSet<QQuickItem*> *filtered); static QTouchEvent *touchEventForItem(QQuickItem *target, const QTouchEvent &originalEvent, bool alwaysCheckBounds = false); static QTouchEvent *touchEventWithPoints(const QTouchEvent &event, const QList<QTouchEvent::TouchPoint> &newPoints); bool sendFilteredTouchEvent(QQuickItem *target, QQuickItem *item, QTouchEvent *event, QSet<QQuickItem*> *filtered); |