Skip to content

Fix ControlsList TreeView selection change handling to prevent blank-click updates #813

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
令琴怀雅 (Roshaless) wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix ControlsList TreeView selection change handling to prevent blank-click updates #813

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion Sample Applications/WPFGallery/MainWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@
AutomationProperties.Name="Navigation Pane"
ItemsSource="{Binding ViewModel.Controls}"
PreviewKeyDown="ControlsList_PreviewKeyDown"
PreviewMouseLeftButtonUp="ControlsList_PreviewMouseLeftButtonUp"
SelectedItemChanged="ControlsList_SelectedItemChanged"
Loaded="ControlsList_Loaded">
<TreeView.ItemTemplate>
<HierarchicalDataTemplate ItemsSource="{Binding Items}">
Expand Down
6 changes: 2 additions & 4 deletions Sample Applications/WPFGallery/MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@ private void OnNavigating(object? sender, NavigatingEventArgs e)
if(selectedTreeViewItem != null)
{
selectedTreeViewItem.IsSelected = true;
ControlsList_SelectedItemChanged();
}
}
}
Expand Down Expand Up @@ -262,16 +261,15 @@ private void ResizeNavChevrons()

private void SelectedItemChanged(TreeViewItem? tvi)
{
ControlsList_SelectedItemChanged();
if (tvi != null)
{
tvi.IsExpanded = !tvi.IsExpanded;
}
}

private void ControlsList_SelectedItemChanged()
private void ControlsList_SelectedItemChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
{
if (ControlsList.SelectedItem is ControlInfoDataItem navItem)
if (e.NewValue is ControlInfoDataItem navItem)
{
_navigationService.Navigate(navItem.PageType);
var tvi = ControlsList.ItemContainerGenerator.ContainerFromItem(navItem) as TreeViewItem;
Expand Down
Loading