Skip to content

Fixes #2120. TreeView: Hide cursor in single select mode by default, add cursor toggle to TreeViewFileSystem Scenario #2123

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 22, 2022
Merged

Fixes #2120. TreeView: Hide cursor in single select mode by default, add cursor toggle to TreeViewFileSystem Scenario #2123

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
8ccfdd9
Add menu toggle for DesiredCursorVisibility to TreeView UICatalog sce…
Oct 21, 2022
ff3a132
Change TreeView default cursor to invisible and force invisible only …
Oct 22, 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
16 changes: 10 additions & 6 deletions Terminal.Gui/Views/TreeView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,19 +219,23 @@ public int ScrollOffsetHorizontal {
/// <value></value>
public AspectGetterDelegate<T> AspectGetter { get; set; } = (o) => o.ToString () ?? "";

CursorVisibility desiredCursorVisibility = CursorVisibility.Default;
CursorVisibility desiredCursorVisibility = CursorVisibility.Invisible;

/// <summary>
/// Get / Set the wished cursor when the tree is focused
/// Get / Set the wished cursor when the tree is focused.
/// Only applies when <see cref="MultiSelect"/> is true.
/// Defaults to <see cref="CursorVisibility.Invisible"/>
/// </summary>
public CursorVisibility DesiredCursorVisibility {
get => desiredCursorVisibility;
get {
return MultiSelect ? desiredCursorVisibility : CursorVisibility.Invisible;
}
set {
desiredCursorVisibility = value;

if (desiredCursorVisibility != value && HasFocus) {
Application.Driver.SetCursorVisibility (value);
Application.Driver.SetCursorVisibility (DesiredCursorVisibility);
}

desiredCursorVisibility = value;
}
}

Expand Down
16 changes: 16 additions & 0 deletions UICatalog/Scenarios/TreeViewFileSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ public class TreeViewFileSystem : Scenario {
private MenuItem miFullPaths;
private MenuItem miLeaveLastRow;
private MenuItem miCustomColors;
private MenuItem miCursor;
private MenuItem miMultiSelect;
private Terminal.Gui.Attribute green;
private Terminal.Gui.Attribute red;

Expand Down Expand Up @@ -54,6 +56,8 @@ public override void Setup ()
miFullPaths = new MenuItem ("_FullPaths", "", () => SetFullName()){Checked = false, CheckType = MenuItemCheckStyle.Checked},
miLeaveLastRow = new MenuItem ("_LeaveLastRow", "", () => SetLeaveLastRow()){Checked = true, CheckType = MenuItemCheckStyle.Checked},
miCustomColors = new MenuItem ("C_ustomColors", "", () => SetCustomColors()){Checked = false, CheckType = MenuItemCheckStyle.Checked},
miCursor = new MenuItem ("Curs_or (MultiSelect only)", "", () => SetCursor()){Checked = false, CheckType = MenuItemCheckStyle.Checked},
miMultiSelect = new MenuItem ("_MultiSelect", "", () => SetMultiSelect()){Checked = true, CheckType = MenuItemCheckStyle.Checked},
}),
});
Top.Add (menu);
Expand Down Expand Up @@ -269,6 +273,18 @@ private void SetLeaveLastRow ()
miLeaveLastRow.Checked = !miLeaveLastRow.Checked;
treeViewFiles.Style.LeaveLastRow = miLeaveLastRow.Checked;
}
private void SetCursor()
{
miCursor.Checked = !miCursor.Checked;
treeViewFiles.DesiredCursorVisibility = miCursor.Checked ? CursorVisibility.Default : CursorVisibility.Invisible;
}
private void SetMultiSelect()
{
miMultiSelect.Checked = !miMultiSelect.Checked;
treeViewFiles.MultiSelect = miMultiSelect.Checked;
}


private void SetCustomColors()
{
var yellow = new ColorScheme
Expand Down