dan/Toolkit2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved NavigationViewExtension

Browse Source
This commit is contained in:
TheXamlGuy
2024-10-01 20:18:17 +01:00
parent 5a5d3f80a9
commit 060bb93b62
3 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Toolkit.UI.Avalonia/NavigationViewExtension.cs
+5 -7
View File
@@ -27,15 +27,14 @@ public class NavigationViewExtension
{
if (sender.GetLogicalAncestors().OfType<NavigationView>().FirstOrDefault() is NavigationView navigationView)
{
void OnItemInvoked(object? _, FluentAvalonia.UI.Controls.NavigationViewItemInvokedEventArgs args)
sender.GetObservable(NavigationViewItem.IsSelectedProperty).Subscribe(args =>
{
if (args.InvokedItemContainer == sender)
if (args)
{
sender.RaiseEvent(new ItemInvokedEventArgs { RoutedEvent = ItemInvokedEvent });
}
}
});
navigationView.ItemInvoked += OnItemInvoked;
return true;
}
@@ -44,13 +43,12 @@ public class NavigationViewExtension
if (!TrySetupNavigationView())
{
void OnAttachedToVisualTree(object? _, VisualTreeAttachmentEventArgs __)
void HandleLoaded(object? _, RoutedEventArgs __)
{
sender.AttachedToVisualTree -= OnAttachedToVisualTree;
TrySetupNavigationView();
}
sender.AttachedToVisualTree += OnAttachedToVisualTree;
sender.Loaded += HandleLoaded;
}
}