Set focus on opened code reader/drawing popup so ESC can close that i…

…nstead of the app
opengisch · Apr 14, 2024 · d1108e3 · d1108e3
1 parent bdea9aa
commit d1108e3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/qml/QFieldSketcher.qml b/src/qml/QFieldSketcher.qml
@@ -22,15 +22,18 @@ Popup {
   closePolicy: Popup.CloseOnEscape
   dim: true
 
+  onOpened: {
+    contentItem.forceActiveFocus()
+  }
+
   Settings {
     id: settings
     property color strokeColor: "#000000"
   }
 
-  Page {
+  Pane {
     width: parent.width
     height: parent.height
-    padding: 0
 
     DrawingCanvas {
       id: drawingCanvas

diff --git a/src/qml/imports/QFieldControls/CodeReader.qml b/src/qml/imports/QFieldControls/CodeReader.qml
@@ -44,6 +44,10 @@ Popup {
     }
   }
 
+  onOpened: {
+    contentItem.forceActiveFocus()
+  }
+
   onAboutToHide: {
     if (cameraLoader.active) {
       cameraLoader.item.camera.torchMode = Camera.TorchOff