AaronFiore/electrum
1
0
Fork 0
Code Activity

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

Browse Source 
This reverts commit 7f7ee8d82f.

This commit caused a regression with the android back button not closing a dialog.

reproduce:
1. from the main window, press receive.
2. in the request details window, press Create request.
3. in the receive payment dialog, press Copy
4. observe dialog cannot be closed by back button
This commit is contained in:
Sander van Grieken
2023-03-23 10:12:05 +01:00
parent 9eb25cd442
commit e7cc2c5a63
3 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
electrum/gui/qml/components/Pin.qml
View File

@@ -23,7 +23,7 @@ ElDialog {
focus: true focus: true
closePolicy: canCancel ? Popup.CloseOnPressOutside : Popup.NoAutoClose closePolicy: canCancel ? Popup.CloseOnEscape | Popup.CloseOnPressOutside : Popup.NoAutoClose
property bool canCancel: true property bool canCancel: true

2
electrum/gui/qml/components/controls/ElDialog.qml
View File

@@ -19,7 +19,7 @@ Dialog {
} }
closePolicy: allowClose closePolicy: allowClose
? Popup.CloseOnPressOutside ? Popup.CloseOnEscape | Popup.CloseOnPressOutside
: Popup.NoAutoClose : Popup.NoAutoClose
onOpenedChanged: { onOpenedChanged: {

8
electrum/gui/qml/components/main.qml
View File

@@ -439,14 +439,6 @@ ApplicationWindow
} }
} }
Shortcut {
context: Qt.ApplicationShortcut
sequence: "Esc"
onActivated: {
close()
}
}
Connections { Connections {
target: Daemon target: Daemon
function onWalletRequiresPassword(name, path) { function onWalletRequiresPassword(name, path) {