Skip to content

hw_wallet/qt: reuse message dialog to fix lag between device prompts #10718

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sashazykov wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −1
Open

hw_wallet/qt: reuse message dialog to fix lag between device prompts #10718

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion electrum/hw_wallet/qt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ def __init__(self, win: Union['ElectrumWindow', 'QENewWalletWizard'], device: st
self.win = win
self.device = device
self.dialog = None
self.dialog_label = None
self._dialog_on_cancel = None
self.done = threading.Event()

def top_level_window(self):
Expand Down Expand Up @@ -174,12 +176,22 @@ def word_dialog(self, msg):

MESSAGE_DIALOG_TITLE = None # type: Optional[str]
def message_dialog(self, msg, on_cancel=None):
# If a dialog is already open, update its text instead of rebuilding it.
# A device emits one button request per output, and rebuilding the
# window-modal dialog each time is slow and visibly janky on macOS
# (the modal "sheet" animates closed/open between outputs). See #10718.
if self.dialog is not None and self._dialog_on_cancel == on_cancel:
self.dialog_label.setText(msg)
if not self.dialog.isVisible(): # e.g. was hidden by a user "cancel"
self.dialog.show()
return
self.clear_dialog()
title = self.MESSAGE_DIALOG_TITLE
if title is None:
title = _('Please check your {} device').format(self.device)
self.dialog = dialog = WindowModalDialog(self.top_level_window(), title)
label = QLabel(msg)
self._dialog_on_cancel = on_cancel
self.dialog_label = label = QLabel(msg)
label.setTextInteractionFlags(Qt.TextInteractionFlag.TextSelectableByMouse)
vbox = QVBoxLayout(dialog)
vbox.addWidget(label)
Expand All @@ -197,6 +209,8 @@ def clear_dialog(self):
if self.dialog:
self.dialog.accept()
self.dialog = None
self.dialog_label = None
self._dialog_on_cancel = None

def win_query_choice(self, msg: str, choices: Sequence[ChoiceItem]):
try:
Expand Down