From 3946b87191d4c10ceda572dc90dad428ecab3bc2 Mon Sep 17 00:00:00 2001
From: VitorVieiraZ <vmvieira8@outlook.com>
Date: Wed, 19 Jun 2024 08:32:03 -0300
Subject: [PATCH] more freezing cases fix in formPage

---
 app/qml/components/MMToolbar.qml | 2 +-
 app/qml/form/MMFormPage.qml      | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/qml/components/MMToolbar.qml b/app/qml/components/MMToolbar.qml
index f3db04b96..3e1568fca 100644
--- a/app/qml/components/MMToolbar.qml
+++ b/app/qml/components/MMToolbar.qml
@@ -120,7 +120,7 @@ Rectangle {
 
       onClicked: {
         // Prevent freezing by clearing focus from all elements
-        // See more at https://github.com/MerginMaps/mobile/issues/3389
+        // Issues #3389 and #3483
         root.forceActiveFocus()
         root.index = model.index
         model.btnData.clicked()
diff --git a/app/qml/form/MMFormPage.qml b/app/qml/form/MMFormPage.qml
index fddabf3b3..228533669 100644
--- a/app/qml/form/MMFormPage.qml
+++ b/app/qml/form/MMFormPage.qml
@@ -209,10 +209,7 @@ Page {
         text: qsTr( "Edit geometry" )
         iconSource: __style.editIcon
         visible: root.layerIsSpatial
-        onClicked: {
-          root.forceActiveFocus() // clear focus from all elements to prevent freezing #3483
-          root.editGeometryRequested( root.controller.featureLayerPair )
-        }
+        onClicked: root.editGeometryRequested( root.controller.featureLayerPair )
       }
     }