aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickwindow_p.h
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2016-07-01 16:56:43 +0200
committerFrederik Gladhorn <frederik.gladhorn@qt.io>2016-07-02 10:34:22 +0000
commitf1216b9c4a6cc239c6ed730fcf14e6fd4b3cecdb (patch)
treeeee66150797d36448a60870ad08ec12f3b7b6113 /src/quick/items/qquickwindow_p.h
parentc7de423a8cf033524dfe5a9d2b69412abbb03cbb (diff)
add QQuickWindowPrivate::removeGrabber()
The goal is to eventually avoid accessing QQuickWindowPrivate's own variables inside QQuickItemPrivate, and to use itemForTouchPointId instead of mouseGrabberItem. PinchArea relies on some strange behavior: when one touch point is released, it ungrabs the mouse, but keeps the touch point grab. This seems somewhat inconsistent, but for now we keep one place (QQuickItem::ungrabMouse) that does the mouse ungrab only. Change-Id: I46389475da2ecb157508e092f9f3f0cf923881e3 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.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quick/items/qquickwindow_p.h b/src/quick/items/qquickwindow_p.h
index 1ab2617f0a..ac430f3e0c 100644
--- a/src/quick/items/qquickwindow_p.h
+++ b/src/quick/items/qquickwindow_p.h
@@ -143,6 +143,7 @@ public:
bool translateTouchToMouse(QQuickItem *item, QTouchEvent *event);
void translateTouchEvent(QTouchEvent *touchEvent);
void setMouseGrabber(QQuickItem *grabber);
+ void removeGrabber(QQuickItem *grabber);
static void transformTouchPoints(QList<QTouchEvent::TouchPoint> &touchPoints, const QTransform &transform);
static QMouseEvent *cloneMouseEvent(QMouseEvent *event, QPointF *transformedLocalPos = 0);
bool deliverInitialMousePressEvent(QQuickItem *, QMouseEvent *);