From 6e869a3044dc9c7562745c6af0964f272097c9b0 Mon Sep 17 00:00:00 2001
From: herr kaste <herr.kaste@gmail.com>
Date: Tue, 9 Jul 2019 12:29:52 +0200
Subject: [PATCH] Force focus interface view

If the user opens e.g. the status dashboard using keybindings she can be
actually in a panel (like Terminus et.al.) at that time. In that case a simple
`window.focus_view` is not enough to bring the cursor to the view, we must
focus the group first.
---
 common/ui.py | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/common/ui.py b/common/ui.py
index 1dcef1ccd..a9279e116 100644
--- a/common/ui.py
+++ b/common/ui.py
@@ -16,6 +16,16 @@
 EDIT_DEFAULT_HELP_TEXT = "## To finalize your edit, press {super_key}+Enter.  To cancel, close the view.\n"
 
 
+def focus_view(view):
+    window = view.window()
+    if not window:
+        return
+
+    group, _ = window.get_view_index(view)
+    window.focus_group(group)
+    window.focus_view(view)
+
+
 class Interface():
 
     interface_type = ""
@@ -35,9 +45,11 @@ def __new__(cls, repo_path=None, **kwargs):
             window = sublime.active_window()
             for view in window.views():
                 vset = view.settings()
-                if vset.get("git_savvy.interface") == cls.interface_type and \
-                   vset.get("git_savvy.repo_path") == repo_path:
-                    window.focus_view(view)
+                if (
+                    vset.get("git_savvy.interface") == cls.interface_type
+                    and vset.get("git_savvy.repo_path") == repo_path
+                ):
+                    focus_view(view)
                     try:
                         return interfaces[view.id()]
                     except KeyError:
@@ -97,7 +109,7 @@ def create_view(self, repo_path):
         self.view.set_name(self.title())
 
         self.render()
-        window.focus_view(self.view)
+        focus_view(self.view)
 
         return self.view