Use MouseArea instead of TapHandler

MerginMaps · Oct 4, 2023 · f7764d6 · f7764d6 · inputapp-bot · Oct 4, 2023
1 parent 4cb3aca
commit f7764d6
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 36 deletions.
diff --git a/app/qml/NumberSpin.qml b/app/qml/NumberSpin.qml
@@ -73,9 +73,11 @@ Item {
       width: imageDecrease.width * 3
       height: imageDecrease.height * 3
 
-      TapHandler {  
-        onTapped: function(eventPoint, button) {
-            if (minValue <= root.value - 1) root.value -=1
+      MouseArea {
+        anchors.fill: parent
+
+        onClicked: {
+          if (minValue <= root.value - 1) root.value -=1
         }
       }
     }
@@ -86,9 +88,11 @@ Item {
       width: imageIncrease.width * 3
       height: imageIncrease.height * 3
 
-      TapHandler {
-        onTapped: function(eventPoint, button) {
-            if (maxValue >= root.value + 1) root.value +=1
+      MouseArea {
+        anchors.fill: parent
+
+        onClicked: {
+          if (maxValue >= root.value + 1) root.value +=1
         }
       }
     }

diff --git a/app/qml/SettingsPanel.qml b/app/qml/SettingsPanel.qml
@@ -114,8 +114,10 @@ Item {
               onCheckedChanged: __appSettings.autoCenterMapChecked = checked
             }
 
-            TapHandler {
-              onTapped: function(eventPoint, button) {
+            MouseArea {
+              anchors.fill: parent
+
+              onClicked: {
                 autoCenterMapSwitch.toggle()
               }
             }
@@ -217,8 +219,10 @@ Item {
               onCheckedChanged: __appSettings.gpsAccuracyWarning = checked
             }
 
-            TapHandler {
-              onTapped: function(eventPoint, button) {
+            MouseArea {
+              anchors.fill: parent
+
+              onClicked: {
                 accuracyWarningSwitch.toggle()
               }
             }
@@ -300,8 +304,10 @@ Item {
               onCheckedChanged: __appSettings.reuseLastEnteredValues = checked
             }
 
-            TapHandler {
-              onTapped: function(eventPoint, button) {
+            MouseArea {
+              anchors.fill: parent
+
+              onClicked: {
                 rememberValuesSwitch.toggle()
               }
             }
@@ -320,8 +326,10 @@ Item {
               onCheckedChanged: __appSettings.autosyncAllowed = checked
             }
 
-            TapHandler {
-              onTapped: function(eventPoint, button) {
+            MouseArea {
+              anchors.fill: parent
+
+              onClicked: {
                 autosyncSwitch.toggle()
               }
             }

diff --git a/app/qml/components/MainPanelButton.qml b/app/qml/components/MainPanelButton.qml
@@ -38,14 +38,16 @@ Rectangle {
         anchors.fill: parent
         enabled: root.enabled && handleClicks
 
-        TapHandler {
-            onTapped: function(eventPoint, button) {
-                root.activated()
-            }
+        MouseArea {
+          anchors.fill: parent
 
-            onLongPressed: {
-                root.activatedOnHold()
-            }
+          onClicked: {
+            root.activated()
+          }
+
+          onPressAndHold: {
+            root.activatedOnHold()
+          }
         }
     }
 

diff --git a/app/qml/components/MapFloatButton.qml b/app/qml/components/MapFloatButton.qml
@@ -50,12 +50,14 @@ Item {
     Item {
       anchors.fill: parent
 
-      TapHandler {
-        onTapped: function(eventPoint, button) {
+      MouseArea {
+        anchors.fill: parent
+
+        onClicked: {
           root.clicked()
         }
 
-        onLongPressed: function() {
+        onPressAndHold: {
           root.pressAndHold()
         }
       }

diff --git a/app/qml/editor/AbstractEditor.qml b/app/qml/editor/AbstractEditor.qml
@@ -60,11 +60,11 @@ Item {
         x: leftActionContainer.actionAllowed ? parent.x - customStyle.fields.sideMargin : parent.x
         height: parent.height
 
-        TapHandler {
-          onPressedChanged: {
-            if ( !pressed ) {
-              root.leftActionClicked()
-            }
+        MouseArea {
+          anchors.fill: parent
+
+          onReleased: {
+            root.leftActionClicked()
           }
         }
       }
@@ -79,8 +79,10 @@ Item {
       height: parent.height
       width: parent.width - ( leftActionContainer.width + rightActionContainer.width )
 
-      TapHandler {
-        onSingleTapped: {
+      MouseArea {
+        anchors.fill: parent
+
+        onClicked: {
           root.contentClicked()
         }
       }
@@ -101,11 +103,11 @@ Item {
         width: rightActionContainer.actionAllowed ? parent.width + customStyle.fields.sideMargin : parent.width
         height: parent.height
 
-        TapHandler {
-          onPressedChanged: {
-            if ( !pressed ) {
-              root.rightActionClicked()
-            }
+        MouseArea {
+          anchors.fill: parent
+
+          onReleased: {
+            root.rightActionClicked()
           }
         }
       }