summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyanJenkins <rjenkins@mail.sfsu.edu>2017-12-26 20:19:39 -0800
committerRyanJenkins <rjenkins@mail.sfsu.edu>2017-12-26 20:19:39 -0800
commit9cb25e0c76e80b311898fd5aace7c27ac2169bdc (patch)
tree37f055d078bd330ab87e912b889aedb7f781f4e7
parentd9b00acdc665e88d41d96bdba199f5f69c2302d8 (diff)
downloadqutebrowser-9cb25e0c76e80b311898fd5aace7c27ac2169bdc.tar.gz
qutebrowser-9cb25e0c76e80b311898fd5aace7c27ac2169bdc.zip
Raise browser window after editor closes regardless of outcome of
inserting text and avoid calling QApplication.instance().alert() in this scenario.
-rw-r--r--qutebrowser/browser/commands.py3
-rw-r--r--qutebrowser/mainwindow/mainwindow.py6
2 files changed, 6 insertions, 3 deletions
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index a912842f6..3fffbcfb7 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -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):
diff --git a/qutebrowser/mainwindow/mainwindow.py b/qutebrowser/mainwindow/mainwindow.py
index 3adce7567..9d288b565 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=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