File tree Expand file tree Collapse file tree 3 files changed +5
-6
lines changed Expand file tree Collapse file tree 3 files changed +5
-6
lines changed Original file line number Diff line number Diff line change @@ -690,8 +690,9 @@ Rectangle {
690
690
Keys .onReleased : event => {
691
691
if (event .key === Qt .Key_Back || event .key === Qt .Key_Escape ) {
692
692
// if visible overlays (such as embedded feature forms) are present, don't take over
693
- if (Overlay .overlay && Overlay .overlay .visibleChildren .length > 1 || (Overlay .overlay .visibleChildren .length === 1 && ! toast .visible ))
693
+ if (Overlay .overlay && Overlay .overlay .visibleChildren .length > 1 || (Overlay .overlay .visibleChildren .length === 1 && ! toast .visible )) {
694
694
return ;
695
+ }
695
696
if (state != " FeatureList" ) {
696
697
if (featureListToolBar .state === " Edit" ) {
697
698
featureForm .requestCancel ();
Original file line number Diff line number Diff line change @@ -22,11 +22,7 @@ Popup {
22
22
padding: 0
23
23
24
24
closePolicy: Popup .CloseOnEscape
25
- dim: true
26
-
27
- onOpened: {
28
- contentItem .forceActiveFocus ();
29
- }
25
+ focus: visible
30
26
31
27
Settings {
32
28
id: settings
Original file line number Diff line number Diff line change @@ -4227,6 +4227,8 @@ ApplicationWindow {
4227
4227
QFieldSketcher {
4228
4228
id: sketcher
4229
4229
visible: false
4230
+
4231
+ Component .onCompleted : focusstack .addFocusTaker (this )
4230
4232
}
4231
4233
4232
4234
Connections {
You can’t perform that action at this time.
0 commit comments