qml: pressing "Esc" on desktop to ~simulate "back" button

Debu976116 · Mar 21, 2023 · 7f7ee8d · 7f7ee8d
1 parent 9830466
commit 7f7ee8d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/electrum/gui/qml/components/Pin.qml b/electrum/gui/qml/components/Pin.qml
@@ -23,7 +23,7 @@ ElDialog {
 
     focus: true
 
-    closePolicy: canCancel ? Popup.CloseOnEscape | Popup.CloseOnPressOutside : Popup.NoAutoClose
+    closePolicy: canCancel ? Popup.CloseOnPressOutside : Popup.NoAutoClose
 
     property bool canCancel: true
 

diff --git a/electrum/gui/qml/components/controls/ElDialog.qml b/electrum/gui/qml/components/controls/ElDialog.qml
@@ -19,7 +19,7 @@ Dialog {
     }
 
     closePolicy: allowClose
-        ? Popup.CloseOnEscape | Popup.CloseOnPressOutside
+        ? Popup.CloseOnPressOutside
         : Popup.NoAutoClose
 
     onOpenedChanged: {

diff --git a/electrum/gui/qml/components/main.qml b/electrum/gui/qml/components/main.qml
@@ -430,6 +430,14 @@ ApplicationWindow
         }
     }
 
+    Shortcut {
+        context: Qt.ApplicationShortcut
+        sequence: "Esc"
+        onActivated: {
+            close()
+        }
+    }
+
     Connections {
         target: Daemon
         function onWalletRequiresPassword(name, path) {