Try to fix pinching gesture when a finger starts on a bookmark marker

opengisch · Jun 27, 2024 · a0c000a · a0c000a
1 parent ddfc566
commit a0c000a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 0 deletions.
diff --git a/src/qml/BookmarkHighlight.qml b/src/qml/BookmarkHighlight.qml
@@ -7,11 +7,15 @@ import Theme 1.0
 
 Repeater {
   id: bookmarkHighlight
+
+  property alias interactive: bookmarkRenderer.interactive
   property MapSettings mapSettings
 
   model: qfieldSettings.showBookmarks ? bookmarkModel : undefined
 
   delegate: BookmarkRenderer {
+    id: bookmarkRenderer
+
     mapSettings: bookmarkHighlight.mapSettings
     geometryWrapper.qgsGeometry: model.BookmarkPoint
     geometryWrapper.crs: model.BookmarkCrs

diff --git a/src/qml/BookmarkRenderer.qml b/src/qml/BookmarkRenderer.qml
@@ -9,6 +9,8 @@ import Theme 1.0
 Item {
     id: bookmarkRenderer
 
+    property bool interactive: true
+
     property var bookmarkIndex: undefined
     property string bookmarkId: ''
     property string bookmarkName: ''
@@ -124,6 +126,7 @@ Item {
                 }
 
                 MouseArea {
+                    enabled: bookmarkRenderer.interactive
                     anchors.fill: bookmark
                     onClicked: {
                         displayToast(qsTr('Bookmark: %1').arg(bookmarkRenderer.bookmarkName));

diff --git a/src/qml/MapCanvas.qml b/src/qml/MapCanvas.qml
@@ -33,6 +33,7 @@ Item {
 
   property bool interactive: true
   property bool hovered: false
+  property bool dragged: mainDragHandler.active || stylusDragHandler
   property bool pinched: pinchHandler.active
   property bool freehandDigitizing: false
   property bool isMapRotationEnabled: false

diff --git a/src/qml/qgismobileapp.qml b/src/qml/qgismobileapp.qml
@@ -713,6 +713,7 @@ ApplicationWindow {
 
     BookmarkHighlight {
         id: bookmarkHighlight
+        interactive: !mapCanvasMap.dragged
         mapSettings: mapCanvas.mapSettings
     }