Skip to content

Restore keyboard activation for selected tree items #4036

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
SychicBoy wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −0
Open

Restore keyboard activation for selected tree items #4036

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 17 additions & 0 deletions ILSpy/Controls/TreeView/SharpTreeView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,23 @@ void CenterNodeInView(SharpTreeNode node)
scrollViewer.Offset = new Vector(scrollViewer.Offset.X, newOffsetY);
}

protected override bool ShouldTriggerSelection(Visual selectable, KeyEventArgs eventArgs)
{
// Avalonia treats Enter and Space as selection input. For a single selected
// tree item, let SharpTreeView handle those keys instead.
// https://docs.avaloniaui.net/docs/avalonia12-breaking-changes#customizing-selection-behavior
if (eventArgs.KeyModifiers == KeyModifiers.None
&& eventArgs.Key is Key.Enter or Key.Space
&& selectable is SharpTreeViewItem { Node: { } node }
&& SelectedItems?.Count == 1
&& ReferenceEquals(SelectedItem, node))
{
return false;
}

return base.ShouldTriggerSelection(selectable, eventArgs);
}

protected override void OnKeyDown(KeyEventArgs e)
{
// Ctrl+A select-all must work on the first press even before a current item is
Expand Down
Loading