Fixes #3847. TabView changes focus to Tab on Layout.

gui-cs · Nov 24, 2024 · 684fb19 · 684fb19
1 parent 2a30e9e
commit 684fb19
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/Terminal.Gui/Views/TabView/TabRowView.cs b/Terminal.Gui/Views/TabView/TabRowView.cs
@@ -64,11 +64,6 @@ protected override bool OnMouseEvent (MouseEventArgs me)
             return false;
         }
 
-        if (!HasFocus && CanFocus)
-        {
-            SetFocus ();
-        }
-
         if (me.IsSingleDoubleOrTripleClicked)
         {
             var scrollIndicatorHit = 0;

diff --git a/Terminal.Gui/Views/TabView/TabView.cs b/Terminal.Gui/Views/TabView/TabView.cs
@@ -518,6 +518,10 @@ internal IEnumerable<Tab> CalculateViewport (Rectangle bounds)
         {
             SelectedTab?.SetFocus ();
         }
+        else
+        {
+            SelectedTab?.View?.SetFocus ();
+        }
     }
 
     /// <summary>
-Original file line number
+Diff line change
@@ Expand Up @@
             {
                 SelectedTab?.SetFocus ();
             }
+            else
+            {
+                SelectedTab?.View?.SetFocus ();
+            }
         }
         /// <summary>
@@ Expand Down @@