Some more focus improvements and safeguard against tracker going RIP

opengisch · Apr 14, 2024 · b682c7a · b682c7a
1 parent d1108e3
commit b682c7a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/qml/DashBoard.qml b/src/qml/DashBoard.qml
@@ -27,6 +27,10 @@ Drawer {
     }
   }
 
+  onOpened: {
+    contentItem.forceActiveFocus()
+  }
+
   width: Math.min( 300, mainWindow.width)
   height: parent.height
   edge: Qt.LeftEdge

diff --git a/src/qml/Legend.qml b/src/qml/Legend.qml
@@ -54,6 +54,7 @@ ListView {
       onPressAndHold: {
         itemProperties.index = legend.model.index(index, 0)
         itemProperties.open()
+        itemProperties.forceActiveFocus()
       }
       onReleased: (mouse) => {
         if (mouse.button === Qt.RightButton) {

diff --git a/src/qml/TrackerSettings.qml b/src/qml/TrackerSettings.qml
@@ -18,7 +18,7 @@ Popup {
   width: parent.width - Theme.popupScreenEdgeMargin
   height: parent.height - Theme.popupScreenEdgeMargin * 2
   modal: true
-  closePolicy: Popup.CloseOnEscape
+  closePolicy: Popup.NoAutoClose
 
   property var tracker: undefined
 
@@ -549,6 +549,7 @@ Popup {
     active: false
     onLoaded: {
       item.open()
+      item.forceActiveFocus()
     }
   }
 
@@ -565,7 +566,7 @@ Popup {
       width: parent.width - Theme.popupScreenEdgeMargin
       height: parent.height - Theme.popupScreenEdgeMargin * 2
       modal: true
-      closePolicy: Popup.CloseOnEscape
+      closePolicy: Popup.NoAutoClose
 
       FeatureForm {
         id: form