Raise browser window after editor closes regardless of outcome of

inserting text and avoid calling QApplication.instance().alert() in this
scenario.
This commit is contained in:
RyanJenkins 2017-12-26 20:19:39 -08:00
parent d9b00acdc6
commit 9cb25e0c76
2 changed files with 6 additions and 3 deletions

View File

@ -1639,12 +1639,13 @@ class CommandDispatcher:
"""
try:
elem.set_value(text)
mainwindow.raise_window(objreg.last_focused_window())
except webelem.OrphanedError as e:
message.error('Edited element vanished')
except webelem.Error as e:
raise cmdexc.CommandError(str(e))
mainwindow.raise_window(objreg.last_focused_window(), alert=False)
@cmdutils.register(instance='command-dispatcher', maxsplit=0,
scope='window')
def insert_text(self, text):

View File

@ -94,13 +94,15 @@ def get_window(via_ipc, force_window=False, force_tab=False,
return window.win_id
def raise_window(window):
def raise_window(window, alert=False):
"""Raise the given MainWindow object."""
window.setWindowState(window.windowState() & ~Qt.WindowMinimized)
window.setWindowState(window.windowState() | Qt.WindowActive)
window.raise_()
window.activateWindow()
QApplication.instance().alert(window)
if alert:
QApplication.instance().alert(window)
# WORKAROUND for https://github.com/PyCQA/pylint/issues/1770