Skip to content

Fix keyboard control if contents of tree change #2

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
merged 3 commits into from
May 28, 2019
Merged

Fix keyboard control if contents of tree change #2

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c21a36
Simply code for keyboard control, and force to pick a more suitable n…
Dwedit May 25, 2019
31a7259
Format PR to project coding standards
trigger-segfault May 28, 2019
b61075d
Re-add missing Key checks. Rewrite obtaining of selectedItem
trigger-segfault May 28, 2019
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
133 changes: 74 additions & 59 deletions WinDirStat.Net.Wpf.Single/Controls/FileList/FileTreeView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,81 +230,96 @@ internal void HandleExpanding(FileItemViewModel node) {
}

protected override void OnKeyDown(KeyEventArgs e) {
FileTreeViewItem container = e.OriginalSource as FileTreeViewItem;
switch (e.Key) {
case Key.Left:
if (container != null && ItemsControl.ItemsControlFromItemContainer(container) == this) {
if (container.Node.IsExpanded) {
container.Node.IsExpanded = false;
FileItemViewModel selectedItem = null;
if (e.OriginalSource is FileTreeViewItem container &&
ItemsControl.ItemsControlFromItemContainer(container) == this)
{
selectedItem = container.Node;
}
else if (e.OriginalSource == this) {
// When the FileTreeFlattener collection is reset, focus will be shifted to the FileTreeView.
selectedItem = SelectedItem as FileItemViewModel;
if (selectedItem != null)
FocusNode(selectedItem);
}
else {
// If we're reaching this, then we may be in some subcontrol of a file item, that control may want
// focus. We'll keep this uncommented out for now until we determine handling needs to be changed.
selectedItem = SelectedItem as FileItemViewModel;
if (selectedItem != null)
FocusNode(selectedItem);
}

if (selectedItem != null) {
switch (e.Key) {
case Key.Left:
if (selectedItem.IsExpanded) {
selectedItem.IsExpanded = false;
}
else if (container.Node.Parent != null) {
this.FocusNode(container.Node.Parent);
else if (selectedItem.Parent != null) {
FocusNode(selectedItem.Parent);
}
e.Handled = true;
}
break;
case Key.Right:
if (container != null && ItemsControl.ItemsControlFromItemContainer(container) == this) {
if (!container.Node.IsExpanded && container.Node.ShowExpander) {
container.Node.IsExpanded = true;
break;
case Key.Right:
if (!selectedItem.IsExpanded && selectedItem.ShowExpander) {
selectedItem.IsExpanded = true;
}
else if (container.Node.Children.Count > 0) {
else if (selectedItem.Children.Count > 0) {
// jump to first child:
container.MoveFocus(new TraversalRequest(FocusNavigationDirection.Down));
var firstChild = selectedItem.Children.FirstOrDefault();
if (firstChild != null) {
FocusNode(firstChild);
}
}
e.Handled = true;
}
break;
case Key.Return:
if (container != null && Keyboard.Modifiers == ModifierKeys.None && this.SelectedItems.Count == 1 && this.SelectedItem == container.Node) {
e.Handled = true;
container.Node.ActivateItem();
}
break;
case Key.Space:
if (container != null && Keyboard.Modifiers == ModifierKeys.None && this.SelectedItems.Count == 1 && this.SelectedItem == container.Node) {
break;
case Key.Return:
case Key.Space:
if (Keyboard.Modifiers == ModifierKeys.None && SelectedItems.Count == 1) {
e.Handled = true;
selectedItem.ActivateItem();
}
break;
/*case Key.Space:
// Normally Space has special functionality, but we don't support checkboxes.
e.Handled = true;
/*if (container.Node.IsCheckable) {
if (container.Node.IsChecked == null) // If partially selected, we want to select everything
container.Node.IsChecked = true;
else
container.Node.IsChecked = !container.Node.IsChecked;
selectedItem.ActivateItem();
if (Keyboard.Modifiers == ModifierKeys.None && SelectedItems.Count == 1) {
e.Handled = true;
if (selectedItem.IsCheckable) {
// If partially selected, we want to select everything
selectedItem.IsChecked = !(selectedItem.IsChecked ?? false);
}
else {
selectedItem.ActivateItem();
}
}
break;*/
case Key.Add:
if (selectedItem.ShowExpander) {
selectedItem.IsExpanded = true;
}
else {*/
container.Node.ActivateItem();
//}
}
break;
case Key.Add:
if (container != null && ItemsControl.ItemsControlFromItemContainer(container) == this) {
if (container.Node.ShowExpander)
container.Node.IsExpanded = true;
e.Handled = true;
}
break;
case Key.Subtract:
if (container != null && ItemsControl.ItemsControlFromItemContainer(container) == this) {
container.Node.IsExpanded = false;
break;
case Key.Subtract:
selectedItem.IsExpanded = false;
e.Handled = true;
}
break;
case Key.Multiply:
if (container != null && ItemsControl.ItemsControlFromItemContainer(container) == this) {
if (container.Node.ShowExpander) {
container.Node.IsExpanded = true;
ExpandRecursively(container.Node);
break;
case Key.Multiply:
if (selectedItem.ShowExpander) {
selectedItem.IsExpanded = true;
ExpandRecursively(selectedItem);
}
e.Handled = true;
}
break;
case Key.Divide:
if (container != null && ItemsControl.ItemsControlFromItemContainer(container) == this) {
if (container.Node.Parent != null) {
FocusNode(container.Node.Parent);
break;
case Key.Divide:
if (selectedItem.Parent != null) {
FocusNode(selectedItem.Parent);
}
e.Handled = true;
break;
}
break;
}
if (!e.Handled)
base.OnKeyDown(e);
Expand Down