summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2016-09-14 13:22:36 +0200
committerJohan Helsing <johan.helsing@qt.io>2016-09-15 10:06:59 +0000
commit1e8595c525ec2abf8991d776f4d0fdb664964e69 (patch)
tree3f4a8d1a37fdd35ed044c85dcc28e116b7ddb0c5
parent2f83f4490b6c644bb02fa6bf9d88e87492418723 (diff)
Add missing mouse ungrab when touch ends
Task-number: QTBUG-54453 Change-Id: Ie8fadd89797cd7c9ff5bf00924706bd662bbd22d Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com> Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
-rw-r--r--src/compositor/compositor_api/qwaylandquickitem.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/compositor/compositor_api/qwaylandquickitem.cpp b/src/compositor/compositor_api/qwaylandquickitem.cpp
index a1855529c..5e90c06c7 100644
--- a/src/compositor/compositor_api/qwaylandquickitem.cpp
+++ b/src/compositor/compositor_api/qwaylandquickitem.cpp
@@ -645,6 +645,12 @@ void QWaylandQuickItem::touchEvent(QTouchEvent *event)
grabMouse();
}
+ if (event->type() == QEvent::TouchEnd) {
+ QQuickItem *grabber = window()->mouseGrabberItem();
+ if (grabber == this)
+ ungrabMouse();
+ }
+
QPoint pointPos;
const QList<QTouchEvent::TouchPoint> &points = event->touchPoints();
if (!points.isEmpty())