Skip to content
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

Jump to bottom

Fixing not able to collapse an item using enter key issue. #645

Merged
merged 5 commits into from
Sep 27, 2024
Merged

Fixing not able to collapse an item using enter key issue. #645

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6a5b3bb
Fixing not able to collpase an item using enter key issue.
himgoyalmicro Sep 6, 2024
7ef61dc
Fixing the navigation issue
himgoyalmicro Sep 26, 2024
c1d2b86
Merge branch 'main' into user/himgoyal/collapseBug
himgoyalmicro Sep 26, 2024
6fbf50c
Fixing toggle Button Issue
himgoyalmicro Sep 27, 2024
8913515
Code Cleanup
himgoyalmicro Sep 27, 2024
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
19 changes: 16 additions & 3 deletions Sample Applications/WPFGallery/MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using System.Windows.Automation.Peers;
using System.Windows.Automation;
using WPFGallery.Controls;
using System.Windows.Controls.Primitives;

namespace WPFGallery;

Expand Down Expand Up @@ -92,7 +93,6 @@ private void ControlsList_SelectedItemChanged()
var tvi = ControlsList.ItemContainerGenerator.ContainerFromItem(navItem) as TreeViewItem;
if(tvi != null)
{
tvi.IsExpanded = true;
tvi.BringIntoView();
}
}
Expand Down Expand Up @@ -202,17 +202,30 @@ private void RootContentFrame_Navigated(object sender, NavigationEventArgs e)
ViewModel.UpdateCanNavigateBack();
}

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

private void ControlsList_PreviewKeyDown(object sender, KeyEventArgs e)
{
if (e.Key == Key.Enter)
{
ControlsList_SelectedItemChanged();
SelectedItemChanged(ControlsList.ItemContainerGenerator.ContainerFromItem((sender as TreeView).SelectedItem) as TreeViewItem);
}
}

private void ControlsList_PreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
{
ControlsList_SelectedItemChanged();
if (e.OriginalSource is ToggleButton)
{
return;
}
SelectedItemChanged(ControlsList.ItemContainerGenerator.ContainerFromItem((sender as TreeView).SelectedItem) as TreeViewItem);
}

private void AboutButton_Click(object sender, RoutedEventArgs e)
Expand Down
Loading