Skip to content

Fixes #2133. TreeView: desiredCursorVisibility field is set before the if condition check. #2134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tig merged 2 commits into from
Oct 31, 2022
Merged

Fixes #2133. TreeView: desiredCursorVisibility field is set before the if condition check. #2134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04a8395
Fixes #2133. TreeView: desiredCursorVisibility field is set before th…
BDisp Oct 23, 2022
368b759
Merge branch 'develop' into treeview-desiredCursorVisibility-set-fix
tig Oct 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions Terminal.Gui/Views/TreeView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,12 @@ public Key ObjectActivationKey {
/// <value></value>
public MouseFlags? ObjectActivationButton { get; set; } = MouseFlags.Button1DoubleClicked;


/// <summary>
/// Delegate for multi colored tree views. Return the <see cref="ColorScheme"/> to use
/// for each passed object or null to use the default.
/// </summary>
public Func<T,ColorScheme> ColorGetter {get;set;}
public Func<T, ColorScheme> ColorGetter { get; set; }

/// <summary>
/// Secondary selected regions of tree when <see cref="MultiSelect"/> is true
Expand Down Expand Up @@ -227,14 +227,15 @@ public int ScrollOffsetHorizontal {
/// Defaults to <see cref="CursorVisibility.Invisible"/>
/// </summary>
public CursorVisibility DesiredCursorVisibility {
get {
get {
return MultiSelect ? desiredCursorVisibility : CursorVisibility.Invisible;
}
set {
desiredCursorVisibility = value;

if (desiredCursorVisibility != value && HasFocus) {
Application.Driver.SetCursorVisibility (DesiredCursorVisibility);
if (desiredCursorVisibility != value) {
desiredCursorVisibility = value;
if (HasFocus) {
Application.Driver.SetCursorVisibility (DesiredCursorVisibility);
}
}
}
}
Expand Down Expand Up @@ -626,7 +627,7 @@ public void ActivateSelectedObjectIfAny ()
/// </summary>
/// <param name="toFind"></param>
/// <returns></returns>
public int? GetObjectRow(T toFind)
public int? GetObjectRow (T toFind)
{
var idx = BuildLineMap ().IndexOf (o => o.Model.Equals (toFind));

Expand Down
72 changes: 48 additions & 24 deletions UnitTests/TreeViewTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -839,65 +839,64 @@ public void TestGetObjectRow ()
Assert.Equal (0, tv.GetObjectRow (n2));
}
[Fact, AutoInitShutdown]
public void TestTreeViewColor()
public void TestTreeViewColor ()
{
var tv = new TreeView{Width = 20,Height = 10};
var tv = new TreeView { Width = 20, Height = 10 };

var n1 = new TreeNode("normal");
var n1_1 = new TreeNode("pink");
var n1_2 = new TreeNode("normal");
n1.Children.Add(n1_1);
n1.Children.Add(n1_2);
var n1 = new TreeNode ("normal");
var n1_1 = new TreeNode ("pink");
var n1_2 = new TreeNode ("normal");
n1.Children.Add (n1_1);
n1.Children.Add (n1_2);

var n2 = new TreeNode("pink");
tv.AddObject(n1);
tv.AddObject(n2);
tv.Expand(n1);
var n2 = new TreeNode ("pink");
tv.AddObject (n1);
tv.AddObject (n2);
tv.Expand (n1);

var pink = new Attribute(Color.Magenta,Color.Black);
var hotpink = new Attribute(Color.BrightMagenta,Color.Black);
var pink = new Attribute (Color.Magenta, Color.Black);
var hotpink = new Attribute (Color.BrightMagenta, Color.Black);

tv.ColorScheme = new ColorScheme();
tv.Redraw(tv.Bounds);
tv.ColorScheme = new ColorScheme ();
tv.Redraw (tv.Bounds);

// Normal drawing of the tree view
TestHelpers.AssertDriverContentsAre(
@"├-normal
│ ├─pink
│ └─normal
└─pink
",output);
", output);
// Should all be the same color
TestHelpers.AssertDriverColorsAre(
@"00000000
00000000
0000000000
000000
",
new []{tv.ColorScheme.Normal,pink});
new [] { tv.ColorScheme.Normal, pink });

// create a new color scheme
var pinkScheme = new ColorScheme
{
var pinkScheme = new ColorScheme {
Normal = pink,
Focus = hotpink
};

// and a delegate that uses the pink color scheme
// for nodes "pink"
tv.ColorGetter = (n)=> n.Text.Equals("pink") ? pinkScheme : null;
tv.ColorGetter = (n) => n.Text.Equals ("pink") ? pinkScheme : null;

// redraw now that the custom color
// delegate is registered
tv.Redraw(tv.Bounds);
tv.Redraw (tv.Bounds);

// Same text
TestHelpers.AssertDriverContentsAre(
@"├-normal
│ ├─pink
│ └─normal
└─pink
",output);
", output);
// but now the item (only not lines) appear
// in pink when they are the word "pink"
TestHelpers.AssertDriverColorsAre(
Expand All @@ -906,7 +905,32 @@ public void TestTreeViewColor()
0000000000
001111
",
new []{tv.ColorScheme.Normal,pink});
new [] { tv.ColorScheme.Normal, pink });
}

[Fact, AutoInitShutdown]
public void DesiredCursorVisibility_MultiSelect ()
{
var tv = new TreeView { Width = 20, Height = 10 };

var n1 = new TreeNode ("normal");
var n2 = new TreeNode ("pink");
tv.AddObject (n1);
tv.AddObject (n2);

Application.Top.Add (tv);
Application.Begin (Application.Top);

Assert.True (tv.MultiSelect);
Assert.True (tv.HasFocus);
Assert.Equal (CursorVisibility.Invisible, tv.DesiredCursorVisibility);

tv.SelectAll ();
tv.DesiredCursorVisibility = CursorVisibility.Default;
Application.Refresh ();
Application.Driver.GetCursorVisibility (out CursorVisibility visibility);
Assert.Equal (CursorVisibility.Default, tv.DesiredCursorVisibility);
Assert.Equal (CursorVisibility.Default, visibility);
}

/// <summary>
Expand Down