Merge pull request #80 from adenexter/jb30851

Fixes for mishandled touch release and cancel events.
sailfishos · Sep 15, 2015 · 277b8cf · 277b8cf
2 parents 016381e + 362b450
commit 277b8cf
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp
@@ -1251,7 +1251,7 @@ void QQuickFlickable::mouseReleaseEvent(QMouseEvent *event)
             if (window() && window()->mouseGrabberItem()) {
                 QPointF localPos = window()->mouseGrabberItem()->mapFromScene(event->windowPos());
                 QScopedPointer<QMouseEvent> mouseEvent(QQuickWindowPrivate::cloneMouseEvent(event, &localPos));
-                window()->sendEvent(window()->mouseGrabberItem(), mouseEvent.data());
+                QCoreApplication::sendEvent(window(), mouseEvent.data());
             }
 
             // And the event has been consumed
@@ -2059,6 +2059,7 @@ bool QQuickFlickable::sendMouseEvent(QQuickItem *item, QMouseEvent *event)
             break;
         case QEvent::MouseButtonRelease:
             d->handleMouseReleaseEvent(mouseEvent.data());
+            stealThisEvent = d->stealMouse;
             break;
         default:
             break;

diff --git a/src/quick/items/qquickmousearea.cpp b/src/quick/items/qquickmousearea.cpp
@@ -867,6 +867,7 @@ bool QQuickMouseArea::sendMouseEvent(QMouseEvent *event)
             break;
         case QEvent::MouseButtonRelease:
             mouseReleaseEvent(&mouseEvent);
+            stealThisEvent = d->stealMouse;
             break;
         default:
             break;

diff --git a/src/quick/items/qquickmultipointtoucharea.cpp b/src/quick/items/qquickmultipointtoucharea.cpp
@@ -412,6 +412,12 @@ void QQuickMultiPointTouchArea::touchEvent(QTouchEvent *event)
         }
         break;
     }
+    case QEvent::TouchCancel:
+        _stealMouse = false;
+        setKeepMouseGrab(false);
+        setKeepTouchGrab(false);
+        ungrabTouchPoints();
+        break;
     default:
         QQuickItem::touchEvent(event);
         break;