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

BDisp · BDisp · commit 684fb199ed43 · 2024-11-24T12:53:00.000Z
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 number	Diff line change
`@@ -64,11 +64,6 @@ protected override bool OnMouseEvent (MouseEventArgs me)`
`64`	`64`	`return false;`
`65`	`65`	`}`
`66`	`66`
`67`		`- if (!HasFocus && CanFocus)`
`68`		`- {`
`69`		`- SetFocus ();`
`70`		`- }`
`71`		`-`
`72`	`67`	`if (me.IsSingleDoubleOrTripleClicked)`
`73`	`68`	`{`
`74`	`69`	`var scrollIndicatorHit = 0;`
Original file line number	Diff line number	Diff line change
`@@ -518,6 +518,10 @@ internal IEnumerable<Tab> CalculateViewport (Rectangle bounds)`
`518`	`518`	`{`
`519`	`519`	`SelectedTab?.SetFocus ();`
`520`	`520`	`}`
	`521`	`+ else`
	`522`	`+ {`
	`523`	`+ SelectedTab?.View?.SetFocus ();`
	`524`	`+ }`
`521`	`525`	`}`
`522`	`526`
`523`	`527`	`/// <summary>`