Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2025-12-26 15:57:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3353 from BDisp/v2_tabindex-fix_3351

Browse Source 
Fixes #3351. TabIndex with the same setter value but with wrong index return without set the correct value.
This commit is contained in:
Tig
2024-03-31 10:48:59 -06:00
committed by GitHub
parent 5b367b3df1 d7fec3c3f1
commit 0ef67d785b
2 changed files with 74 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Terminal.Gui/View/ViewKeyboard.cs
View File

@@ -267,7 +267,7 @@ public partial class View
return;
}
if (_tabIndex == value)
if (_tabIndex == value && TabIndexes.IndexOf (this) == value)
{
return;
}

73
UnitTests/View/NavigationTests.cs
View File

@@ -1290,6 +1290,79 @@ public class NavigationTests
r.Dispose ();
}
[Fact]
public void TabIndex_Invert_Order ()
{
var r = new View ();
var v1 = new View () { Id = "1", CanFocus = true };
var v2 = new View () { Id = "2", CanFocus = true };
var v3 = new View () { Id = "3", CanFocus = true };
r.Add (v1, v2, v3);
v1.TabIndex = 2;
v2.TabIndex = 1;
v3.TabIndex = 0;
Assert.True (r.TabIndexes.IndexOf (v1) == 2);
Assert.True (r.TabIndexes.IndexOf (v2) == 1);
Assert.True (r.TabIndexes.IndexOf (v3) == 0);
Assert.True (r.Subviews.IndexOf (v1) == 0);
Assert.True (r.Subviews.IndexOf (v2) == 1);
Assert.True (r.Subviews.IndexOf (v3) == 2);
}
[Fact]
public void TabIndex_Invert_Order_Added_One_By_One_Does_Not_Do_What_Is_Expected ()
{
var r = new View ();
var v1 = new View () { Id = "1", CanFocus = true };
r.Add (v1);
v1.TabIndex = 2;
var v2 = new View () { Id = "2", CanFocus = true };
r.Add (v2);
v2.TabIndex = 1;
var v3 = new View () { Id = "3", CanFocus = true };
r.Add (v3);
v3.TabIndex = 0;
Assert.False (r.TabIndexes.IndexOf (v1) == 2);
Assert.True (r.TabIndexes.IndexOf (v1) == 1);
Assert.False (r.TabIndexes.IndexOf (v2) == 1);
Assert.True (r.TabIndexes.IndexOf (v2) == 2);
// Only the last is in the expected index
Assert.True (r.TabIndexes.IndexOf (v3) == 0);
Assert.True (r.Subviews.IndexOf (v1) == 0);
Assert.True (r.Subviews.IndexOf (v2) == 1);
Assert.True (r.Subviews.IndexOf (v3) == 2);
}
[Fact]
public void TabIndex_Invert_Order_Mixed ()
{
var r = new View ();
var vl1 = new View () { Id = "vl1" };
var v1 = new View () { Id = "v1", CanFocus = true };
var vl2 = new View () { Id = "vl2" };
var v2 = new View () { Id = "v2", CanFocus = true };
var vl3 = new View () { Id = "vl3" };
var v3 = new View () { Id = "v3", CanFocus = true };
r.Add (vl1, v1, vl2, v2, vl3, v3);
v1.TabIndex = 2;
v2.TabIndex = 1;
v3.TabIndex = 0;
Assert.True (r.TabIndexes.IndexOf (v1) == 4);
Assert.True (r.TabIndexes.IndexOf (v2) == 2);
Assert.True (r.TabIndexes.IndexOf (v3) == 0);
Assert.True (r.Subviews.IndexOf (v1) == 1);
Assert.True (r.Subviews.IndexOf (v2) == 3);
Assert.True (r.Subviews.IndexOf (v3) == 5);
}
[Fact]
public void TabStop_All_False_And_All_True_And_Changing_TabStop_Later ()
{