Skip to content

Fixes #4595 - Refactors View.Command, CommandContext, and InputBinding to simplify #4596

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

Open
tig wants to merge 14 commits into
base: v2_develop
Choose a base branch
from
Open

Fixes #4595 - Refactors View.Command, CommandContext, and InputBinding to simplify #4596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5ecedf8
Initial plan
Copilot Jan 9, 2026
154a4b5
Add comprehensive command propagation analysis document
Copilot Jan 9, 2026
b70f54c
Merge branch 'v2_develop' into copilot/fix-command-propagation-issue
tig Jan 13, 2026
93b9e82
Merge branch 'v2_develop' into copilot/fix-command-propagation-issue
tig Jan 15, 2026
975c7eb
Merge branch 'v2_develop' into copilot/fix-command-propagation-issue
tig Jan 19, 2026
2a3acb9
Merge branch 'v2_develop' into copilot/fix-command-propagation-issue
tig Jan 20, 2026
4e207ba
- Added `Source` property to `IInputBinding`
tig Jan 20, 2026
a42d75e
- `MouseBindingTests.cs` - 14 tests covering constructor, propertie…
tig Jan 20, 2026
9fc5cfe
updated plans
tig Jan 20, 2026
261d5e1
Phase 2: New Types ✅ COMPLETED
tig Jan 20, 2026
8bcc8a5
- Created `InputBinding` record struct in `Terminal.Gui\Input\Input…
tig Jan 21, 2026
b4ec69b
udpated docs
tig Jan 21, 2026
128b843
udpated doc
tig Jan 21, 2026
9b85b44
deleted plan file
tig Jan 21, 2026
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
136 changes: 51 additions & 85 deletions Examples/UICatalog/Scenarios/CharacterMap/CharacterMap.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,38 +56,27 @@ public override void Main ()
using IApplication app = Application.Create ();
app.Init ();

using Window top = new ()
{
BorderStyle = LineStyle.None
};
using Window top = new () { BorderStyle = LineStyle.None };

_charMap = new ()
_charMap = new CharMap
{
X = 0,
Y = 1,
Height = Dim.Fill ()
X = 0, Y = 1, Height = Dim.Fill ()

// SchemeName = "Base"
};
top.Add (_charMap);

var jumpLabel = new Label
{
X = Pos.Right (_charMap) + 1,
Y = Pos.Y (_charMap),
HotKeySpecifier = (Rune)'_',
Text = "_Jump To:"
X = Pos.Right (_charMap) + 1, Y = Pos.Y (_charMap), HotKeySpecifier = (Rune)'_', Text = "_Jump To:"

//SchemeName = "Dialog"
};
top.Add (jumpLabel);

var jumpEdit = new TextField
{
X = Pos.Right (jumpLabel) + 1,
Y = Pos.Y (_charMap),
Width = 17,
Title = "e.g. 01BE3 or ✈"
X = Pos.Right (jumpLabel) + 1, Y = Pos.Y (_charMap), Width = 17, Title = "e.g. 01BE3 or ✈"

//SchemeName = "Dialog"
};
Expand All @@ -105,7 +94,7 @@ public override void Main ()
}
};

_errorLabel = new ()
_errorLabel = new Label
{
X = Pos.Right (jumpEdit) + 1,
Y = Pos.Y (_charMap),
Expand All @@ -117,11 +106,9 @@ public override void Main ()

jumpEdit.Accepting += JumpEditOnAccept;

_categoryList = new ()
_categoryList = new TableView
{
X = Pos.Right (_charMap),
Y = Pos.Bottom (jumpLabel),
Height = Dim.Fill ()
X = Pos.Right (_charMap), Y = Pos.Bottom (jumpLabel), Height = Dim.Fill ()

//SchemeName = "Dialog"
};
Expand All @@ -137,41 +124,38 @@ public override void Main ()

// if user clicks the mouse in TableView
_categoryList.Activating += (_, e) =>
{
// Only handle mouse clicks
if (e.Context is not CommandContext<MouseBinding> { Binding.MouseEventArgs: { } mouse })
{
return;
}
{
// Only handle mouse clicks
if (e.Context?.Binding is not MouseBinding { MouseEvent: { } mouse })
{
return;
}

_categoryList.ScreenToCell (mouse.Position!.Value, out int? clickedCol);
_categoryList.ScreenToCell (mouse.Position!.Value, out int? clickedCol);

if (clickedCol != null && mouse.Flags.HasFlag (MouseFlags.LeftButtonClicked))
{
EnumerableTableSource<UnicodeRange> table = (EnumerableTableSource<UnicodeRange>)_categoryList.Table;
string prevSelection = table.Data.ElementAt (_categoryList.SelectedRow).Category;
isDescending = !isDescending;
if (clickedCol != null && mouse.Flags.HasFlag (MouseFlags.LeftButtonClicked))
{
EnumerableTableSource<UnicodeRange> table = (EnumerableTableSource<UnicodeRange>)_categoryList.Table;
string prevSelection = table.Data.ElementAt (_categoryList.SelectedRow).Category;
isDescending = !isDescending;

_categoryList.Table = CreateCategoryTable (clickedCol.Value, isDescending);
_categoryList.Table = CreateCategoryTable (clickedCol.Value, isDescending);

table = (EnumerableTableSource<UnicodeRange>)_categoryList.Table;
table = (EnumerableTableSource<UnicodeRange>)_categoryList.Table;

_categoryList.SelectedRow = table.Data
.Select ((item, index) => new { item, index })
.FirstOrDefault (x => x.item.Category == prevSelection)
?.index
?? -1;
}
};
_categoryList.SelectedRow =
table.Data.Select ((item, index) => new { item, index })
.FirstOrDefault (x => x.item.Category == prevSelection)
?.index
?? -1;
}
};

int longestName = UnicodeRange.Ranges.Max (r => r.Category.GetColumns ());

_categoryList.Style.ColumnStyles.Add (
0,
new () { MaxWidth = longestName, MinWidth = longestName, MinAcceptableWidth = longestName }
);
_categoryList.Style.ColumnStyles.Add (1, new () { MaxWidth = 1, MinWidth = 6 });
_categoryList.Style.ColumnStyles.Add (2, new () { MaxWidth = 1, MinWidth = 6 });
_categoryList.Style.ColumnStyles.Add (0, new ColumnStyle { MaxWidth = longestName, MinWidth = longestName, MinAcceptableWidth = longestName });
_categoryList.Style.ColumnStyles.Add (1, new ColumnStyle { MaxWidth = 1, MinWidth = 6 });
_categoryList.Style.ColumnStyles.Add (2, new ColumnStyle { MaxWidth = 1, MinWidth = 6 });

_categoryList.Width = _categoryList.Style.ColumnStyles.Sum (c => c.Value.MinWidth) + 4;

Expand All @@ -188,21 +172,9 @@ public override void Main ()
{
Menus =
[
new (
Strings.menuFile,
new MenuItem []
{
new (
Strings.cmdQuit,
$"{Application.QuitKey}",
() => _charMap?.App?.RequestStop ()
)
}
),
new (
"_Options",
[CreateMenuShowWidth (), CreateMenuUnicodeCategorySelector ()]
)
new MenuBarItem (Strings.menuFile,
new MenuItem [] { new (Strings.cmdQuit, $"{Application.QuitKey}", () => _charMap?.App?.RequestStop ()) }),
new MenuBarItem ("_Options", [CreateMenuShowWidth (), CreateMenuUnicodeCategorySelector ()])
]
};
top.Add (menu);
Expand Down Expand Up @@ -282,8 +254,7 @@ void JumpEditOnAccept (object? sender, CommandEventArgs e)

EnumerableTableSource<UnicodeRange> table = (EnumerableTableSource<UnicodeRange>)_categoryList!.Table;

_categoryList.SelectedRow = table.Data
.Select ((item, index) => new { item, index })
_categoryList.SelectedRow = table.Data.Select ((item, index) => new { item, index })
.FirstOrDefault (x => x.item.Start <= result && x.item.End >= result)
?.index
?? -1;
Expand Down Expand Up @@ -314,47 +285,42 @@ private EnumerableTableSource<UnicodeRange> CreateCategoryTable (int sortByColum
categorySort = sortIndicator;

break;

case 1:
orderBy = r => r.Start;
startSort = sortIndicator;

break;

case 2:
orderBy = r => r.End;
endSort = sortIndicator;

break;

default:
throw new ArgumentException ("Invalid column number.");
}

IOrderedEnumerable<UnicodeRange> sortedRanges = descending
? UnicodeRange.Ranges.OrderByDescending (orderBy)
: UnicodeRange.Ranges.OrderBy (orderBy);

return new (
sortedRanges,
new ()
{
{ $"Category{categorySort}", s => s.Category },
{ $"Start{startSort}", s => $"{s.Start:x5}" },
{ $"End{endSort}", s => $"{s.End:x5}" }
}
);
IOrderedEnumerable<UnicodeRange> sortedRanges = descending ? UnicodeRange.Ranges.OrderByDescending (orderBy) : UnicodeRange.Ranges.OrderBy (orderBy);

return new EnumerableTableSource<UnicodeRange> (sortedRanges,
new Dictionary<string, Func<UnicodeRange, object>>
{
{ $"Category{categorySort}", s => s.Category },
{ $"Start{startSort}", s => $"{s.Start:x5}" },
{ $"End{endSort}", s => $"{s.End:x5}" }
});
}

private MenuItem CreateMenuShowWidth ()
{
CheckBox cb = new ()
{
Title = "_Show Glyph Width",
CheckedState = _charMap!.ShowGlyphWidths ? CheckState.Checked : CheckState.None
};
CheckBox cb = new () { Title = "_Show Glyph Width", CheckedState = _charMap!.ShowGlyphWidths ? CheckState.Checked : CheckState.None };
var item = new MenuItem { CommandView = cb };

item.Action += () =>
{
if (_charMap is not null)
if (_charMap is { })
{
_charMap.ShowGlyphWidths = cb.CheckedState == CheckState.Checked;
}
Expand All @@ -381,6 +347,6 @@ private MenuItem CreateMenuUnicodeCategorySelector ()

selector.ValueChanged += (_, e) => _charMap.ShowUnicodeCategory = e.Value;

return new () { CommandView = selector };
return new MenuItem { CommandView = selector };
}
}
Loading
Loading