fix form editors and geometry (#3156)

small fixes for form editors and geometry point editing
MerginMaps · Mar 19, 2024 · 0ffc2ff · 0ffc2ff · inputapp-bot · Mar 19, 2024
1 parent e81cc78
commit 0ffc2ff
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/app/qml/form/editors/MMFormTextMultilineEditor.qml b/app/qml/form/editors/MMFormTextMultilineEditor.qml
@@ -38,7 +38,7 @@ MMBaseInput {
   property bool _fieldRememberValueState: parent.fieldRememberValueState
 
   property alias placeholderText: textArea.placeholderText
-  property alias text: textArea.text
+  property string text: _fieldValue === undefined || _fieldValueIsNull ? '' : _fieldValue
 
   property int minimumRows: 3
 
@@ -76,7 +76,7 @@ MMBaseInput {
     height: contentHeight + textArea.verticalPadding
     width: parent.width
 
-    text: root._fieldValue === undefined || root._fieldValueIsNull ? '' : root._fieldValue
+    text: root.text
     textFormat: root._fieldConfig['UseHtml'] ? TextEdit.RichText : TextEdit.PlainText
 
     hoverEnabled: true
@@ -92,8 +92,9 @@ MMBaseInput {
 
     onTextChanged: root.editorValueChanged( text, text === "" )
 
+    // Avoid Android's uncommited text
     // Could in theory be fixed with `inputMethodComposing` TextInput property instead
-    onPreeditTextChanged: Qt.inputMethod.commit() // to avoid Android's uncommited text
+    onPreeditTextChanged: if ( __androidUtils.isAndroid ) Qt.inputMethod.commit()
   }
 
   FontMetrics {

diff --git a/app/qml/form/editors/MMFormValueMapEditor.qml b/app/qml/form/editors/MMFormValueMapEditor.qml
@@ -72,7 +72,7 @@ MMDropdownInput {
 
   on_FieldValueChanged: {
 
-    if ( _fieldValueIsNull ) {
+    if ( _fieldValueIsNull || _fieldValue === undefined ) {
       text = ""
       preselectedFeatures = []
     }

diff --git a/app/qml/form/editors/MMFormValueRelationEditor.qml b/app/qml/form/editors/MMFormValueRelationEditor.qml
@@ -75,7 +75,7 @@ MMDropdownInput {
 
       selectedFeatures: {
         if ( internal.allowMultivalue ) {
-          root.preselectedFeatures = vrModel.convertFromQgisType( root._fieldValue, FeaturesModel.FeatureId )
+          root.preselectedFeatures = vrModel.convertFromQgisType( root._fieldValue, MM.FeaturesModel.FeatureId )
         }
         else {
           root.preselectedFeatures = [root._fieldValue]

diff --git a/app/qml/map/MMRecordingTools.qml b/app/qml/map/MMRecordingTools.qml
@@ -246,14 +246,15 @@ Item {
       }
 
       MMToolbarButton {
-        text: qsTr( "Record" );
-        iconSource: __style.doneCircleIcon;
+        text: qsTr( "Record" )
+
+        iconSource: __style.doneCircleIcon
         iconColor: __style.grassColor
         onClicked: {
           if ( mapTool.hasValidGeometry() )
           {
             // If we currently grab a point
-            if ( mapTool.state == MM.RecordingMapTool.Grab )
+            if ( mapTool.state === MM.RecordingMapTool.Grab )
             {
               mapTool.releaseVertex( crosshair.recordPoint )
             }
@@ -277,7 +278,16 @@ Item {
         iconSource: __style.doneCircleIcon;
         iconColor: __style.forestColor
         onClicked: {
-          mapTool.addPoint( crosshair.recordPoint )
+          if ( mapTool.state === MM.RecordingMapTool.Grab )
+          {
+            // editing existing point geometry
+            mapTool.releaseVertex( crosshair.recordPoint )
+          } else
+          {
+            // recording new point
+            mapTool.addPoint( crosshair.recordPoint )
+          }
+
           let pair = mapTool.getFeatureLayerPair()
           root.done( pair )
         }