diff options
author | Florian Bruhin <git@the-compiler.org> | 2018-01-10 09:39:08 +0100 |
---|---|---|
committer | Florian Bruhin <git@the-compiler.org> | 2018-01-10 09:39:08 +0100 |
commit | 6b9edefb0500e0cffa9775a3d2713f8ec3683810 (patch) | |
tree | 8cafd8bb1015cd65ad3bb59c6283653c38d25e5e | |
parent | 0518a03b1e627805b33cf2757aa1c510c948d1ef (diff) | |
parent | 53575aaeed5a1e8389bbf0980fed757e85c34349 (diff) | |
download | qutebrowser-6b9edefb0500e0cffa9775a3d2713f8ec3683810.tar.gz qutebrowser-6b9edefb0500e0cffa9775a3d2713f8ec3683810.zip |
Merge remote-tracking branch 'origin/pr/3432'
-rw-r--r-- | qutebrowser/browser/commands.py | 2 | ||||
-rw-r--r-- | qutebrowser/mainwindow/mainwindow.py | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py index 92a841d72..3fffbcfb7 100644 --- a/qutebrowser/browser/commands.py +++ b/qutebrowser/browser/commands.py @@ -1644,6 +1644,8 @@ class CommandDispatcher: 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): diff --git a/qutebrowser/mainwindow/mainwindow.py b/qutebrowser/mainwindow/mainwindow.py index 3adce7567..dff465c41 100644 --- a/qutebrowser/mainwindow/mainwindow.py +++ b/qutebrowser/mainwindow/mainwindow.py @@ -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=True): """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 |