aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickwindow_p.h
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2016-07-05 13:40:25 +0200
committerFrederik Gladhorn <frederik.gladhorn@qt.io>2016-07-07 20:38:05 +0000
commitf588032c509b01ab4083467afb540d2fdc0685ac (patch)
treedb082a97ed6d45ce875db15e01c52696096e3fb2 /src/quick/items/qquickwindow_p.h
parent649b309ea9ed7d03aa74565d51edb416c23460d9 (diff)
QQuickWindow: add QQuickPointerDevice instances for pointer events
The device objects are long-lived; every QQuickPointerEvent needs a pointer to one of them. Change-Id: I39e4b8ddefd4a62521c7837c4bafb84ee13ce519 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.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/quick/items/qquickwindow_p.h b/src/quick/items/qquickwindow_p.h
index 1b4b87e001..f2ec469b21 100644
--- a/src/quick/items/qquickwindow_p.h
+++ b/src/quick/items/qquickwindow_p.h
@@ -89,6 +89,7 @@ class QQuickItemPrivate;
class QQuickWindowPrivate;
class QTouchEvent;
+class QQuickPointerDevice;
class QQuickWindowRenderLoop;
class QQuickWindowIncubationController;
@@ -155,6 +156,7 @@ public:
#ifndef QT_NO_GESTURES
bool deliverNativeGestureEvent(QQuickItem *, QNativeGestureEvent *);
#endif
+ QQuickPointerDevice *touchDevice(QTouchDevice *d);
bool deliverTouchPoints(QQuickItem *, QTouchEvent *, const QList<QTouchEvent::TouchPoint> &, QSet<int> *,
QHash<QQuickItem *, QList<QTouchEvent::TouchPoint> > *, QSet<QQuickItem*> *filtered);
void handleTouchEvent(QTouchEvent *);
@@ -263,6 +265,10 @@ public:
mutable QQuickWindowIncubationController *incubationController;
+ static QQuickPointerDevice *genericMouseDevice;
+ static QHash<QTouchDevice *, QQuickPointerDevice *> touchDevices;
+ static QHash<qint64, QQuickPointerDevice *> tabletDevices;
+
static bool defaultAlphaBuffer;
static bool dragOverThreshold(qreal d, Qt::Axis axis, QMouseEvent *event, int startDragThreshold = -1);