aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickwindow_p.h
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2016-07-12 16:13:36 +0200
committerFrederik Gladhorn <frederik.gladhorn@qt.io>2016-07-13 08:58:26 +0000
commit03305d33482b1447da2df8425f131477dd146064 (patch)
treecc88b7e31e7c31aa88ef422c923ee03da75e8348 /src/quick/items/qquickwindow_p.h
parentc744706be9d277bb4a265d8368b93de6da23dea2 (diff)
Sort pointer event delivery functions
Change-Id: Ib21a2c4f762a53f2f1d386a40380a68a5383dbe3 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.h19
1 files changed, 13 insertions, 6 deletions
diff --git a/src/quick/items/qquickwindow_p.h b/src/quick/items/qquickwindow_p.h
index 7e75e63817..e18127f3fb 100644
--- a/src/quick/items/qquickwindow_p.h
+++ b/src/quick/items/qquickwindow_p.h
@@ -158,24 +158,31 @@ public:
bool deliverNativeGestureEvent(QQuickItem *, QNativeGestureEvent *);
#endif
static QQuickPointerDevice *touchDevice(QTouchDevice *d);
- bool deliverPoints(QQuickItem *, const QQuickPointerEvent *, const QList<const QQuickEventPoint *> &,
- QSet<quint64> *, QHash<QQuickItem *, QList<const QQuickEventPoint *> > *, QSet<QQuickItem *> *);
+
+ // entry point of events to the window
void handleTouchEvent(QTouchEvent *);
void handleMouseEvent(QMouseEvent *);
+ bool compressTouchEvent(QTouchEvent *);
+ void flushFrameSynchronousEvents();
+ void deliverDelayedTouchEvent();
+
+ // delivery of pointer events:
void deliverPointerEvent(QQuickPointerEvent *);
void deliverTouchEvent(QQuickPointerEvent *);
- bool compressTouchEvent(QTouchEvent *);
bool deliverTouchCancelEvent(QTouchEvent *);
- void deliverDelayedTouchEvent();
- void flushFrameSynchronousEvents();
- bool deliverHoverEvent(QQuickItem *, const QPointF &scenePos, const QPointF &lastScenePos, Qt::KeyboardModifiers modifiers, bool &accepted);
+ bool deliverPoints(QQuickItem *, const QQuickPointerEvent *, const QList<const QQuickEventPoint *> &,
+ QSet<quint64> *, QHash<QQuickItem *, QList<const QQuickEventPoint *> > *, QSet<QQuickItem *> *);
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);
+
+ // hover delivery
+ bool deliverHoverEvent(QQuickItem *, const QPointF &scenePos, const QPointF &lastScenePos, Qt::KeyboardModifiers modifiers, bool &accepted);
bool sendHoverEvent(QEvent::Type, QQuickItem *, const QPointF &scenePos, const QPointF &lastScenePos,
Qt::KeyboardModifiers modifiers, bool accepted);
bool clearHover();
+
#ifndef QT_NO_DRAGANDDROP
void deliverDragEvent(QQuickDragGrabber *, QEvent *);
bool deliverDragEvent(QQuickDragGrabber *, QQuickItem *, QDragMoveEvent *);