From 8411ec0787c4b94c521bf4ba73db2bf00a983ae0 Mon Sep 17 00:00:00 2001 From: rating89us <45968869+rating89us@users.noreply.github.com> Date: Thu, 27 May 2021 22:25:35 +0200 Subject: [PATCH] main: hide/show popups before/after inactivity screen lock --- main.qml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/main.qml b/main.qml index 14c98857..55d6bfee 100644 --- a/main.qml +++ b/main.qml @@ -2212,6 +2212,8 @@ ApplicationWindow { if(!persistentSettings.lockOnUserInActivity) return; if(passwordDialog.visible) return; var inputDialogVisible = inputDialog && inputDialog.visible + var successfulTxPopupVisible = successfulTxPopup && successfulTxPopup.visible + var informationPopupVisible = informationPopup && informationPopup.visible // prompt password after X seconds of inactivity var epoch = Math.floor((new Date).getTime() / 1000); @@ -2221,15 +2223,22 @@ ApplicationWindow { passwordDialog.onAcceptedCallback = function() { if(walletPassword === passwordDialog.password){ passwordDialog.close(); + if (inputDialogVisible) inputDialog.open(inputDialog.inputText) + if (successfulTxPopupVisible) successfulTxPopup.open(successfulTxPopup.transactionID) + if (informationPopupVisible) informationPopup.open() } else { passwordDialog.showError(qsTr("Wrong password")); } - if (inputDialogVisible) inputDialog.open(inputDialog.inputText) } passwordDialog.onRejectedCallback = function() { appWindow.showWizard(); } if (inputDialogVisible) inputDialog.close() remoteNodeDialog.close(); + informationPopup.close() + txConfirmationPopup.close() + txConfirmationPopup.clearFields() + txConfirmationPopup.rejected() + successfulTxPopup.close(); passwordDialog.open(); }