diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2016-08-02 14:17:57 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2016-08-02 17:37:47 +0000 |
| commit | 47ee54455beb1a063515041f85b4c216132491b3 (patch) | |
| tree | e689a9d585e200ce0a0caa8fbe81d4544d7e3044 /src/quick/items/qquickwindow_p.h | |
| parent | af4150ce50ab3aa7b9f34a4ac7fc6dde317f66b0 (diff) | |
Start to unite press event delivery for touch and mouse
Needs some cleanup, but seems to work now.
Change-Id: I579009648d874c9293a0ebb3d7809536420b5574
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/quick/items/qquickwindow_p.h')
| -rw-r--r-- | src/quick/items/qquickwindow_p.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/quick/items/qquickwindow_p.h b/src/quick/items/qquickwindow_p.h index a97ed36b09..11cadb4739 100644 --- a/src/quick/items/qquickwindow_p.h +++ b/src/quick/items/qquickwindow_p.h @@ -145,7 +145,6 @@ public: void removeGrabber(QQuickItem *grabber, bool mouse = true, bool touch = true); static void transformTouchPoints(QList<QTouchEvent::TouchPoint> &touchPoints, const QTransform &transform); static QMouseEvent *cloneMouseEvent(QMouseEvent *event, QPointF *transformedLocalPos = 0); - void deliverInitialMousePressEvent(QQuickPointerMouseEvent *); void deliverMouseEvent(QQuickPointerMouseEvent *pointerEvent); bool sendFilteredMouseEvent(QQuickItem *, QQuickItem *, QEvent *, QSet<QQuickItem *> *); #ifndef QT_NO_WHEELEVENT @@ -167,9 +166,9 @@ public: void deliverPointerEvent(QQuickPointerEvent *); void deliverTouchEvent(QQuickPointerTouchEvent *); bool deliverTouchCancelEvent(QTouchEvent *); - bool deliverNewTouchPoints(QQuickPointerTouchEvent *, QSet<QQuickItem *> *); + bool deliverPressEvent(QQuickPointerEvent *, QSet<QQuickItem *> *); bool deliverUpdatedTouchPoints(QQuickPointerTouchEvent *event, QSet<QQuickItem *> *hasFiltered); - bool deliverMatchingPointsToItem(QQuickItem *item, const QQuickPointerTouchEvent *event, QSet<QQuickItem*> *filtered); + bool deliverMatchingPointsToItem(QQuickItem *item, QQuickPointerEvent *pointerEvent, QSet<QQuickItem*> *filtered); static QTouchEvent *touchEventForItem(QQuickItem *target, const QTouchEvent &originalEvent); static QTouchEvent *touchEventWithPoints(const QTouchEvent &event, const QList<QTouchEvent::TouchPoint> &newPoints); bool sendFilteredTouchEvent(QQuickItem *target, QQuickItem *item, QTouchEvent *event, QSet<QQuickItem*> *filtered); |