Fix: Implemented global cancel shortcut that always returns prompter …

…to edit mode. This approach fixes bug #69 and should prevent it from happening again on this standard key.
Cuperino · Mar 4, 2022 · 82364e2 · 82364e2
1 parent 0ffdb82
commit 82364e2
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 0 deletions.
diff --git a/src/kirigami_ui/+android/main.qml b/src/kirigami_ui/+android/main.qml
@@ -257,6 +257,13 @@ Kirigami.ApplicationWindow {
                 iconName: "application-exit"
                 shortcut: StandardKey.Quit
                 onTriggered: close()
+            },
+            // Global shortcuts
+            // On ESC pressed, return to PrompterEdit mode.
+            Kirigami.Action {
+                visible: false
+                onTriggered: root.pageStack.currentItem.prompter.cancel()
+                shortcut: StandardKey.Cancel
             }
         ]
         topContent: RowLayout {

diff --git a/src/kirigami_ui/+windows/main.qml b/src/kirigami_ui/+windows/main.qml
@@ -315,6 +315,13 @@ Kirigami.ApplicationWindow {
                 iconName: "application-exit"
                 shortcut: StandardKey.Quit
                 onTriggered: close()
+            },
+            // Global shortcuts
+            // On ESC pressed, return to PrompterEdit mode.
+            Kirigami.Action {
+                visible: false
+                onTriggered: root.pageStack.currentItem.prompter.cancel()
+                shortcut: StandardKey.Cancel
             }
         ]
         topContent: RowLayout {

diff --git a/src/kirigami_ui/KeyInputButton.qml b/src/kirigami_ui/KeyInputButton.qml
@@ -127,6 +127,10 @@ Button {
     }
 
     Layout.fillWidth: true
+    Keys.onShortcutOverride: {
+        if (event.key === Qt.Key_Escape)
+            event.accepted = true
+    }
     Keys.onPressed: {
         if (checked) {
             if (isValidInput(event.key)) {

diff --git a/src/kirigami_ui/main.qml b/src/kirigami_ui/main.qml
@@ -307,6 +307,13 @@ Kirigami.ApplicationWindow {
                 iconName: "application-exit"
                 shortcut: StandardKey.Quit
                 onTriggered: close()
+            },
+            // Global shortcuts
+            // On ESC pressed, return to PrompterEdit mode.
+            Kirigami.Action {
+                visible: false
+                onTriggered: root.pageStack.currentItem.prompter.cancel()
+                shortcut: StandardKey.Cancel
             }
         ]
         topContent: RowLayout {

diff --git a/src/prompter/Prompter.qml b/src/prompter/Prompter.qml
@@ -171,6 +171,9 @@ Flickable {
     };
 
     // Toggle prompter state
+    function cancel() {
+        state = Prompter.States.Editing
+    }
     function toggle() {
 
         // Switch to next corresponding prompter state, relative to current configuration