File tree Expand file tree Collapse file tree 2 files changed +14
-13
lines changed Expand file tree Collapse file tree 2 files changed +14
-13
lines changed Original file line number Diff line number Diff line change 52
52
<muxc : NavigationView
53
53
x : Name =" SettingsPane"
54
54
BackRequested =" SettingsPane_BackRequested"
55
+ CompactModeThresholdWidth =" 0"
55
56
IsBackButtonVisible =" Visible"
56
57
IsBackEnabled =" True"
57
58
IsPaneOpen =" True"
58
59
IsPaneToggleButtonVisible =" False"
59
60
IsSettingsVisible =" False"
60
61
IsTitleBarAutoPaddingEnabled =" False"
61
62
OpenPaneLength =" 250"
62
- PaneDisplayMode =" LeftCompact "
63
+ PaneDisplayMode =" Auto "
63
64
SelectionChanged =" SettingsPane_SelectionChanged" >
64
65
65
66
<muxc : NavigationView .PaneHeader>
140
141
</muxc : NavigationView .MenuItems>
141
142
<Frame x : Name =" SettingsContentFrame" Padding =" 14,30,0,0" />
142
143
</muxc : NavigationView >
143
- <VisualStateManager .VisualStateGroups>
144
- <VisualStateGroup >
145
- <VisualState >
146
- <VisualState .StateTriggers>
147
- <AdaptiveTrigger MinWindowWidth =" {x:Bind SettingsPane.CompactModeThresholdWidth}" />
148
- </VisualState .StateTriggers>
149
- <VisualState .Setters>
150
- <Setter Target =" SettingsPane.PaneDisplayMode" Value =" Left" />
151
- </VisualState .Setters>
152
- </VisualState >
153
- </VisualStateGroup >
154
- </VisualStateManager .VisualStateGroups>
155
144
</Grid >
156
145
</Page >
Original file line number Diff line number Diff line change 5
5
using Windows . UI . Core ;
6
6
using Windows . UI . Xaml ;
7
7
using Windows . UI . Xaml . Controls ;
8
+ using Windows . UI . Xaml . Navigation ;
8
9
9
10
namespace Files
10
11
{
@@ -15,6 +16,11 @@ public sealed partial class Settings : Page
15
16
public Settings ( )
16
17
{
17
18
this . InitializeComponent ( ) ;
19
+ }
20
+
21
+ protected override void OnNavigatedTo ( NavigationEventArgs eventArgs )
22
+ {
23
+ base . OnNavigatedTo ( eventArgs ) ;
18
24
19
25
var CoreTitleBar = CoreApplication . GetCurrentView ( ) . TitleBar ;
20
26
CoreTitleBar . ExtendViewIntoTitleBar = true ;
@@ -33,6 +39,12 @@ public Settings()
33
39
SettingsPane . SelectedItem = SettingsPane . MenuItems [ 0 ] ;
34
40
}
35
41
42
+ protected override void OnNavigatedFrom ( NavigationEventArgs eventArgs )
43
+ {
44
+ var currentView = SystemNavigationManager . GetForCurrentView ( ) ;
45
+ currentView . BackRequested -= OnBackRequested ;
46
+ }
47
+
36
48
private void OnBackRequested ( object sender , BackRequestedEventArgs e )
37
49
{
38
50
Frame rootFrame = Window . Current . Content as Frame ;
You can’t perform that action at this time.
0 commit comments