From a29a9a9b70e758d0d372284ff60ade21abc4fc08 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 25 Apr 2014 08:38:11 +0200
Subject: [PATCH] Handle Command widget based on modes, not focus

---
 qutebrowser/app.py               |  1 +
 qutebrowser/widgets/statusbar.py | 28 +++++++++++-----------------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/qutebrowser/app.py b/qutebrowser/app.py
index 5f94dbc07..f4ac3aabb 100644
--- a/qutebrowser/app.py
+++ b/qutebrowser/app.py
@@ -266,6 +266,7 @@ class QuteBrowser(QApplication):
         # status bar
         modes.manager.entered.connect(status.on_mode_entered)
         modes.manager.left.connect(status.on_mode_left)
+        modes.manager.left.connect(status.cmd.on_mode_left)
         modes.manager.key_pressed.connect(status.on_key_pressed)
 
         # commands
diff --git a/qutebrowser/widgets/statusbar.py b/qutebrowser/widgets/statusbar.py
index 1890869b8..3f0485aa9 100644
--- a/qutebrowser/widgets/statusbar.py
+++ b/qutebrowser/widgets/statusbar.py
@@ -337,37 +337,31 @@ class _Command(QLineEdit):
         if item:
             self.set_cmd_text(item)
 
-    def focusInEvent(self, e):
-        """Extend focusInEvent to enter command mode."""
-        modes.enter("command")
-        super().focusInEvent(e)
-
-    def focusOutEvent(self, e):
-        """Extend focusOutEvent to do several tasks.
+    def on_mode_left(self, mode):
+        """Clear up when ommand mode was left.
 
         - Clear the statusbar text if it's explicitely unfocused.
-        - Leave command mode
         - Clear completion selection
         - Hide completion
 
-        FIXME we should rather do this on on_mode_left...
-
         Args:
-            e: The QFocusEvent.
+            mode: The mode which was left.
 
         Emit:
             clear_completion_selection: Always emitted.
             hide_completion: Always emitted so the completion is hidden.
         """
-        modes.maybe_leave("command")
-        if e.reason() in [Qt.MouseFocusReason, Qt.TabFocusReason,
-                          Qt.BacktabFocusReason, Qt.OtherFocusReason]:
+        if mode == "command":
             self.setText('')
             self.history.stop()
             self.hide_cmd.emit()
-        self.clear_completion_selection.emit()
-        self.hide_completion.emit()
-        super().focusOutEvent(e)
+            self.clear_completion_selection.emit()
+            self.hide_completion.emit()
+
+    def focusInEvent(self, e):
+        """Extend focusInEvent to enter command mode."""
+        modes.enter("command")
+        super().focusInEvent(e)
 
 
 class _CommandValidator(QValidator):