Skip to content

Commit 3605169

Browse files
authored
Fixed an issue where opening the properties window would crash the app (#2612)
1 parent 5b97e04 commit 3605169

File tree

2 files changed

+22
-19
lines changed

2 files changed

+22
-19
lines changed

Files/Views/Pages/Properties.xaml

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
VerticalAlignment="Center"
3232
Text="Properties" />
3333

34-
<muxc:NavigationView
34+
<NavigationView
3535
x:Name="NavigationView"
3636
Grid.Row="1"
3737
AllowDrop="False"
@@ -40,44 +40,47 @@
4040
IsPaneToggleButtonVisible="False"
4141
IsSettingsVisible="False"
4242
PaneDisplayMode="Top"
43+
SelectionFollowsFocus="Enabled"
4344
SelectionChanged="NavigationView_SelectionChanged"
44-
SelectionFollowsFocus="Enabled">
45+
SelectedItem="{x:Bind TabGeneral}">
4546

4647
<!-- Tabs -->
47-
<muxc:NavigationView.MenuItems>
48-
<muxc:NavigationViewItem
48+
<NavigationView.MenuItems>
49+
<NavigationViewItem
4950
x:Name="TabGeneral"
5051
x:Uid="PropertiesDialogTabGeneral"
5152
Content="General"
5253
Tag="General">
53-
<muxc:NavigationViewItem.Icon>
54+
<NavigationViewItem.Icon>
5455
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xea00;" />
55-
</muxc:NavigationViewItem.Icon>
56-
</muxc:NavigationViewItem>
57-
<muxc:NavigationViewItem
56+
</NavigationViewItem.Icon>
57+
</NavigationViewItem>
58+
<NavigationViewItem
5859
x:Name="TabShorcut"
5960
x:Uid="PropertiesDialogTabShortcut"
6061
Content="Shortcut"
6162
Tag="Shortcut"
6263
Visibility="Collapsed">
63-
<muxc:NavigationViewItem.Icon>
64+
<NavigationViewItem.Icon>
6465
<FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF10A;" />
65-
</muxc:NavigationViewItem.Icon>
66-
</muxc:NavigationViewItem>
66+
</NavigationViewItem.Icon>
67+
</NavigationViewItem>
6768

68-
<muxc:NavigationViewItem
69+
<NavigationViewItem
6970
x:Name="TabDetails"
7071
x:Uid="PropertiesDialogTabDetailsImage"
7172
Content="Details"
7273
Tag="Details"
7374
Visibility="Collapsed">
74-
<muxc:NavigationViewItem.Icon>
75+
<NavigationViewItem.Icon>
7576
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xea8d;" />
76-
</muxc:NavigationViewItem.Icon>
77-
</muxc:NavigationViewItem>
78-
</muxc:NavigationView.MenuItems>
79-
<Frame x:Name="contentFrame" IsNavigationStackEnabled="False" />
80-
</muxc:NavigationView>
77+
</NavigationViewItem.Icon>
78+
</NavigationViewItem>
79+
</NavigationView.MenuItems>
80+
81+
<Frame x:Name="contentFrame" IsNavigationStackEnabled="False" Grid.Row="1"/>
82+
</NavigationView>
83+
8184
<Grid Grid.Row="2" Padding="8">
8285
<Grid.ColumnDefinitions>
8386
<ColumnDefinition Width="*" />

Files/Views/Pages/Properties.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ private async void Page_KeyDown(object sender, KeyRoutedEventArgs e)
225225
}
226226
}
227227

228-
private void NavigationView_SelectionChanged(Microsoft.UI.Xaml.Controls.NavigationView sender, Microsoft.UI.Xaml.Controls.NavigationViewSelectionChangedEventArgs args)
228+
private void NavigationView_SelectionChanged(NavigationView sender, NavigationViewSelectionChangedEventArgs args)
229229
{
230230
var navParam = new PropertyNavParam()
231231
{

0 commit comments

Comments
 (0)