Skip to content

Commit 46113e9

Browse files
author
Yair Aichenbaum
committed
Finished work on setting ui
1 parent 8ad7da6 commit 46113e9

File tree

4 files changed

+16
-7
lines changed

4 files changed

+16
-7
lines changed

Files/Settings.xaml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,15 @@
1212
<Grid>
1313
<muxc:NavigationView
1414
x:Name="SettingsPane"
15+
PaneTitle="Settings"
16+
Margin="0,8,0,0"
1517
IsBackButtonVisible="Collapsed"
1618
IsSettingsVisible="False"
19+
OpenPaneLength="250"
20+
IsPaneToggleButtonVisible="True"
1721
ItemInvoked="NavigationView_ItemInvoked"
1822
PaneDisplayMode="LeftCompact">
19-
<muxc:NavigationView.MenuItems>
23+
<muxc:NavigationView.MenuItems>
2024
<muxc:NavigationViewItem Content="Personalization" IsSelected="True">
2125
<muxc:NavigationViewItem.Icon>
2226
<FontIcon Glyph="&#xE790;" />
@@ -38,7 +42,10 @@
3842
</muxc:NavigationViewItem.Icon>
3943
</muxc:NavigationViewItem>
4044
</muxc:NavigationView.MenuItems>
41-
<Frame x:Name="SettingsContentFrame" />
45+
<Grid>
46+
<Rectangle x:Name="Divider" Width=".5" Opacity=".5" Fill="{ThemeResource AppBarItemForegroundThemeBrush}" HorizontalAlignment="Left" Visibility="Collapsed" VerticalAlignment="Stretch" Margin="-0,20,0,20"/>
47+
<Frame x:Name="SettingsContentFrame" Margin="1,0,0,0"/>
48+
</Grid>
4249
</muxc:NavigationView>
4350
<VisualStateManager.VisualStateGroups>
4451
<VisualStateGroup>
@@ -48,6 +55,8 @@
4855
</VisualState.StateTriggers>
4956
<VisualState.Setters>
5057
<Setter Target="SettingsPane.PaneDisplayMode" Value="Left" />
58+
<Setter Target="Divider.Visibility" Value="Visible" />
59+
<Setter Target="SettingsPane.IsPaneToggleButtonVisible" Value="False" />
5160
</VisualState.Setters>
5261
</VisualState>
5362
</VisualStateGroup>

Files/SettingsPages/About.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<Grid >
1313
<ScrollViewer >
14-
<StackPanel Margin="24,14"
14+
<StackPanel Margin="12,12"
1515
HorizontalAlignment="Stretch"
1616
VerticalAlignment="Stretch"
1717
Orientation="Vertical"

Files/SettingsPages/Personalization.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
88
mc:Ignorable="d">
99

10-
<Grid Padding="24,24,0,0">
10+
<Grid Margin="12,12">
1111

1212
<ScrollViewer HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
1313
<StackPanel Orientation="Vertical" Spacing="14">

Files/SettingsPages/Preferences.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
1010
mc:Ignorable="d">
1111

12-
<Grid Padding="24,24,0,0">
12+
<Grid Margin="12,12">
1313
<ScrollViewer>
1414
<StackPanel
1515
HorizontalAlignment="Stretch"
@@ -183,8 +183,8 @@
183183

184184
<Grid HorizontalAlignment="Stretch">
185185
<Grid.ColumnDefinitions>
186-
<ColumnDefinition Width="260" />
187-
<ColumnDefinition Width="*" MaxWidth="470" />
186+
<ColumnDefinition Width="200" />
187+
<ColumnDefinition Width="*" MaxWidth="530" />
188188
</Grid.ColumnDefinitions>
189189

190190
<TextBlock

0 commit comments

Comments
 (0)