aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickwindow_p.h
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2016-07-08 14:46:08 +0200
committerFrederik Gladhorn <frederik.gladhorn@qt.io>2016-07-11 12:25:54 +0000
commit62719a97cf4640ff014d9ca0691cc1e7632ef173 (patch)
tree54d75c2e6126e45ec84804fb85c5c508581852d4 /src/quick/items/qquickwindow_p.h
parent62bae5c556251eec5d5295c258df3fb85e3c1bcc (diff)
PointerEvents: start unified delivery code path
This really does nothing but join all incoming events, package them into pointer events and then unpack them to send them on their separate ways again. Change-Id: Iad87b86051963c064d7a41d9a64b4551efe1f039 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.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 e06fe4472d..713f33cc8f 100644
--- a/src/quick/items/qquickwindow_p.h
+++ b/src/quick/items/qquickwindow_p.h
@@ -53,6 +53,7 @@
#include "qquickitem.h"
#include "qquickwindow.h"
+#include "qquickevents_p_p.h"
#include <QtQuick/private/qsgcontext_p.h>
@@ -161,6 +162,7 @@ public:
QHash<QQuickItem *, QList<QTouchEvent::TouchPoint> > *, QSet<QQuickItem*> *filtered);
void handleTouchEvent(QTouchEvent *);
void handleMouseEvent(QMouseEvent *);
+ void deliverPointerEvent(QQuickPointerEvent *);
void deliverTouchEvent(QTouchEvent *);
bool compressTouchEvent(QTouchEvent *);
bool deliverTouchCancelEvent(QTouchEvent *);
@@ -238,6 +240,10 @@ public:
QQuickRenderControl *renderControl;
QQuickAnimatorController *animationController;
QScopedPointer<QTouchEvent> delayedTouch;
+
+ // The current touch or mouse event that is delivered.
+ // This event gets re-used (reset) for every incoming mouse/touch event.
+ QQuickPointerEvent currentPointerEvent;
int touchRecursionGuard;
QQuickCustomRenderStage *customRenderStage;