Check if focus is where it was initially. Fixes #1899.

gitextensions · Jun 19, 2013 · 188add9 · 188add9
1 parent 094415b
commit 188add9
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 7 deletions.
diff --git a/GitUI/CommandsDialogs/FormCommit.cs b/GitUI/CommandsDialogs/FormCommit.cs
@@ -643,14 +643,20 @@ private void LoadUnstagedOutput(IList<GitItemStatus> allChangedFiles)
             if (OnStageAreaLoaded != null)
                 OnStageAreaLoaded();
 
-            if (_loadUnstagedOutputFirstTime && (this.ActiveControl == splitMain))
+            if (_loadUnstagedOutputFirstTime)
             {
-                if (Unstaged.GitItemStatuses.Any())
-                    Unstaged.Focus();
-                else if (Staged.GitItemStatuses.Any())
-                    Message.Focus();
-                else
-                    Amend.Focus();
+                var fc = this.FindFocusedControl();
+
+                if (fc == this.Ok)
+                {
+                    if (Unstaged.GitItemStatuses.Any())
+                        Unstaged.Focus();
+                    else if (Staged.GitItemStatuses.Any())
+                        Message.Focus();
+                    else
+                        Amend.Focus();
+                }
+
                 _loadUnstagedOutputFirstTime = false;
             }
         }

diff --git a/GitUI/GitUIExtensions.cs b/GitUI/GitUIExtensions.cs
@@ -325,5 +325,17 @@ public static void InvokeSync(this Control control, SendOrPostCallback action, o
             if (!control.IsDisposed)
                 UISynchronizationContext.Send(checkDisposedAndInvoke, state);
         }
+
+        public static Control FindFocusedControl(this ContainerControl container)
+        {
+            var control = container.ActiveControl;
+            container = control as ContainerControl;
+
+            if (container == null)
+                return control;
+            else
+                return container.FindFocusedControl();
+        }
+
     }
 }