add theme resources (microsoft/microsoft-ui-xaml#2760)

Kinnara · Dec 3, 2020 · 50dc4e4 · 50dc4e4
1 parent 5d2b4b4
commit 50dc4e4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/ModernWpf.Controls/NavigationView/NavigationView.xaml b/ModernWpf.Controls/NavigationView/NavigationView.xaml
@@ -1126,7 +1126,7 @@
                                                 Placement="BottomEdgeAlignedRight">
                                                 <local:Flyout.FlyoutPresenterStyle>
                                                     <Style TargetType="local:FlyoutPresenter">
-                                                        <Setter Property="Padding" Value="0,8" />
+                                                        <Setter Property="Padding" Value="{DynamicResource TopNavigationViewOverflowMenuPadding}" />
                                                         <!-- Set negative top margin to make the flyout align exactly with the button -->
                                                         <!--<Setter Property="Margin" Value="0,-4,0,0" />-->
                                                     </Style>
@@ -1473,7 +1473,7 @@
                                           Placement="RightEdgeAlignedTop">
                                 <local:Flyout.FlyoutPresenterStyle>
                                     <Style TargetType="local:FlyoutPresenter">
-                                        <Setter Property="Padding" Value="0,8" />
+                                        <Setter Property="Padding" Value="{DynamicResource TopNavigationViewOverflowMenuPadding}" />
                                         <!-- Set negative top margin to make the flyout align exactly with the button -->
                                         <!--<Setter Property="Margin" Value="0,-4,0,0" />-->
                                     </Style>

diff --git a/ModernWpf/Styles/NavigationView.xaml b/ModernWpf/Styles/NavigationView.xaml
@@ -53,8 +53,13 @@
     <Thickness x:Key="TopNavigationViewItemOnOverflowExpandChevronMargin">-4,0,6,0</Thickness>
     <Thickness x:Key="TopNavigationViewItemOnOverflowExpandChevronPadding">12,0,12,0</Thickness>
 
+    <!-- The two resources below must be defined at the app level in order to take effect. -->
+    <Thickness x:Key="TopNavigationViewOverflowMenuPadding">0,8</Thickness>
+    <Thickness x:Key="NavigationViewItemChildrenMenuFlyoutPadding">0,8</Thickness>
+
     <!-- The resource below must be defined at the app level in order to affect the expand/collapse chevron font size
          used in the Top NavigationView's Overflow menu. -->
+    <sys:Double x:Key="NavigationViewItemExpandedGlyphFontSize">12.0</sys:Double>
     <sys:String x:Key="NavigationViewItemExpandedGlyph">&#xE70D;</sys:String>
     <StreamGeometry x:Key="NavigationViewItemExpandedPath">M 18.935547 4.560547 L 19.814453 5.439453 L 10 15.253906 L 0.185547 5.439453 L 1.064453 4.560547 L 10 13.496094 Z</StreamGeometry>