Merge pull request #8273 from SomberNight/202303_qml_esc_shortcut

qml: pressing "Esc" on desktop to ~simulate "back" button
3 years ago · 36687e436d
3 changed files with 10 additions and 2 deletions
--- 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
--- 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: {
--- a/electrum/gui/qml/components/main.qml
+++ b/electrum/gui/qml/components/main.qml
@ -439,6 +439,14 @@ ApplicationWindow
        }
    }
    Shortcut {
        context: Qt.ApplicationShortcut
        sequence: "Esc"
        onActivated: {
            close()
        }
    }
    Connections {
        target: Daemon
        function onWalletRequiresPassword(name, path) {