Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-15 11:17:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Navigation Footer items crashing the Settings app

Browse Source
This commit is contained in:
Jaime Bernardo
2024-03-05 21:42:02 +00:00
parent 769fbe1161
commit 6ca19a53bb
3 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml
View File

@@ -225,22 +225,20 @@
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/VideoConferenceMute.png}" Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/VideoConferenceMute.png}"
IsEnabled="{x:Bind ViewModel.IsVideoConferenceBuild, Mode=OneWay}" /> IsEnabled="{x:Bind ViewModel.IsVideoConferenceBuild, Mode=OneWay}" />
</NavigationView.MenuItems> </NavigationView.MenuItems>
<NavigationView.PaneFooter> <NavigationView.FooterMenuItems>
<StackPanel Orientation="Vertical"> <NavigationViewItem
<NavigationViewItem x:Uid="OOBE_NavViewItem"
x:Uid="OOBE_NavViewItem" Icon="{ui:FontIcon Glyph=&#xF133;}"
Icon="{ui:FontIcon Glyph=&#xF133;}" Tapped="OOBEItem_Tapped" />
Tapped="OOBEItem_Tapped" /> <NavigationViewItem
<NavigationViewItem x:Uid="WhatIsNew_NavViewItem"
x:Uid="WhatIsNew_NavViewItem" Icon="{ui:FontIcon Glyph=&#xE789;}"
Icon="{ui:FontIcon Glyph=&#xE789;}" Tapped="WhatIsNewItem_Tapped" />
Tapped="WhatIsNewItem_Tapped" /> <NavigationViewItem
<NavigationViewItem x:Uid="Feedback_NavViewItem"
x:Uid="Feedback_NavViewItem" Icon="{ui:FontIcon Glyph=&#xED15;}"
Icon="{ui:FontIcon Glyph=&#xED15;}" Tapped="FeedbackItem_Tapped" />
Tapped="FeedbackItem_Tapped" /> </NavigationView.FooterMenuItems>
</StackPanel>
</NavigationView.PaneFooter>
<i:Interaction.Behaviors> <i:Interaction.Behaviors>
<ic:EventTriggerBehavior EventName="ItemInvoked"> <ic:EventTriggerBehavior EventName="ItemInvoked">
<ic:InvokeCommandAction Command="{x:Bind ViewModel.ItemInvokedCommand}" /> <ic:InvokeCommandAction Command="{x:Bind ViewModel.ItemInvokedCommand}" />

6
src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml.cs
View File

@@ -347,7 +347,11 @@ namespace Microsoft.PowerToys.Settings.UI.Views
if (selectedItem != null) if (selectedItem != null)
{ {
Type pageType = selectedItem.GetValue(NavHelper.NavigateToProperty) as Type; Type pageType = selectedItem.GetValue(NavHelper.NavigateToProperty) as Type;
NavigationService.Navigate(pageType); if (pageType != null)
{
// pageType might be null because of the navigation bar footer items.
NavigationService.Navigate(pageType);
}
} }
} }

10
src/settings-ui/Settings.UI/ViewModels/ShellViewModel.cs
View File

@@ -108,9 +108,13 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
{ {
var item = navigationView.MenuItems var item = navigationView.MenuItems
.OfType<NavigationViewItem>() .OfType<NavigationViewItem>()
.First(menuItem => (string)menuItem.Content == (string)args.InvokedItem); .FirstOrDefault(menuItem => (string)menuItem.Content == (string)args.InvokedItem, null);
var pageType = item.GetValue(NavHelper.NavigateToProperty) as Type; if (item != null)
NavigationService.Navigate(pageType); {
// item might be null because of the navigation bar footer items.
var pageType = item.GetValue(NavHelper.NavigateToProperty) as Type;
NavigationService.Navigate(pageType);
}
} }
private void OnBackRequested(NavigationView sender, NavigationViewBackRequestedEventArgs args) private void OnBackRequested(NavigationView sender, NavigationViewBackRequestedEventArgs args)