Grab mouse when a gesture is detected.

If the mouse is not grabbed when a gesture is detected both the map and
any MouseArea end up handling the same mouse events.

Change-Id: I62d2a576250484f465b8c60f8ab60aad032b1490
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

1 files changed, 10 insertions, 6 deletions

diff --git a/src/imports/location/qdeclarativegeomap.cpp b/src/imports/location/qdeclarativegeomap.cpp
index 8310fd48..a4d86b84 100644
--- a/src/imports/location/qdeclarativegeomap.cpp
+++ b/src/imports/location/qdeclarativegeomap.cpp
@@ -812,19 +812,23 @@ bool QDeclarativeGeoMap::childMouseEventFilter(QQuickItem *item, QEvent *event)
     case QEvent::MouseButtonPress:
     case QEvent::MouseButtonRelease:
     case QEvent::MouseMove:
-        if (!item->keepMouseGrab())
-            return gestureArea_->filterMapChildMouseEvent(static_cast<QMouseEvent *>(event));
-        else
+        if (item->keepMouseGrab())
             return false;
+        if (!gestureArea_->filterMapChildMouseEvent(static_cast<QMouseEvent *>(event)))
+            return false;
+        grabMouse();
+        return true;
     case QEvent::UngrabMouse:
         return gestureArea_->filterMapChildMouseEvent(static_cast<QMouseEvent *>(event));
     case QEvent::TouchBegin:
     case QEvent::TouchUpdate:
     case QEvent::TouchEnd:
-        if (!item->keepMouseGrab())
-            return gestureArea_->filterMapChildTouchEvent(static_cast<QTouchEvent *>(event));
-        else
+        if (item->keepMouseGrab())
+            return false;
+        if (!gestureArea_->filterMapChildTouchEvent(static_cast<QTouchEvent *>(event)))
             return false;
+        grabMouse();
+        return true;
     case QEvent::Wheel:
         return gestureArea_->wheelEvent(static_cast<QWheelEvent *>(event));
     default: