Skip to content

Commit 654d187

Browse files
committed
Fix esc/back not working with the QField drawing/sketcher popup
1 parent c30e85d commit 654d187

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

src/qml/FeatureListForm.qml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -690,8 +690,9 @@ Rectangle {
690690
Keys.onReleased: event => {
691691
if (event.key === Qt.Key_Back || event.key === Qt.Key_Escape) {
692692
// 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)) {
694694
return;
695+
}
695696
if (state != "FeatureList") {
696697
if (featureListToolBar.state === "Edit") {
697698
featureForm.requestCancel();

src/qml/QFieldSketcher.qml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,7 @@ Popup {
2222
padding: 0
2323

2424
closePolicy: Popup.CloseOnEscape
25-
dim: true
26-
27-
onOpened: {
28-
contentItem.forceActiveFocus();
29-
}
25+
focus: visible
3026

3127
Settings {
3228
id: settings

src/qml/qgismobileapp.qml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4227,6 +4227,8 @@ ApplicationWindow {
42274227
QFieldSketcher {
42284228
id: sketcher
42294229
visible: false
4230+
4231+
Component.onCompleted: focusstack.addFocusTaker(this)
42304232
}
42314233

42324234
Connections {

0 commit comments

Comments
 (0)