[NavigationView] Fix centering of NVI labels a bit using bottom paddi…

…ng (#5187) * Fix bug by adding bottom padding * Switch to better way * Update verification files * update verification files * update verification files * Revert "update verification files" This reverts commit 168daee. * update visual verification files --------- Co-authored-by: Dilip Ojha <[email protected]> Co-authored-by: Karen Lai <[email protected]>
microsoft · Oct 27, 2023 · cf6e864 · cf6e864
1 parent e680e28
commit cf6e864
Show file tree

Hide file tree

Showing 17 changed files with 2,021 additions and 62 deletions.
diff --git a/dev/NavigationView/NavigationView_rs1_themeresources.xaml b/dev/NavigationView/NavigationView_rs1_themeresources.xaml
@@ -288,9 +288,9 @@
     <Thickness x:Key="NavigationViewCompactItemSeparatorMargin">0,3,0,4</Thickness>
     <Thickness x:Key="TopNavigationViewItemSeparatorMargin">3,0,4,0</Thickness>
     <Thickness x:Key="TopNavigationViewOverflowButtonMargin">0</Thickness>
-    <Thickness x:Key="NavigationViewItemContentPresenterMargin">4,-1,8,-1</Thickness>
+    <Thickness x:Key="NavigationViewItemContentPresenterMargin">4,-1,8,0</Thickness>
     <Thickness x:Key="NavigationViewCompactItemContentPresenterMargin">0,0,0,0</Thickness>
-    <Thickness x:Key="TopNavigationViewItemContentPresenterMargin">8,-1,12,-1</Thickness>
+    <Thickness x:Key="TopNavigationViewItemContentPresenterMargin">8,-1,12,0</Thickness>
     <Thickness x:Key="TopNavigationViewItemContentOnlyContentPresenterMargin">12,0</Thickness>
     <Thickness x:Key="NavigationViewItemExpandChevronMargin">0,0,-14,0</Thickness>
     <Thickness x:Key="TopNavigationViewItemExpandChevronMargin">-16,0,0,0</Thickness>

diff --git a/dev/NavigationView/NavigationView_rs1_themeresources_v1.xaml b/dev/NavigationView/NavigationView_rs1_themeresources_v1.xaml
@@ -264,9 +264,9 @@
     <Thickness x:Key="NavigationViewCompactItemSeparatorMargin">16,10</Thickness>
     <Thickness x:Key="TopNavigationViewItemSeparatorMargin">10,0</Thickness>
     <Thickness x:Key="TopNavigationViewOverflowButtonMargin">0</Thickness>
-    <Thickness x:Key="NavigationViewItemContentPresenterMargin">0,0,20,0</Thickness>
+    <Thickness x:Key="NavigationViewItemContentPresenterMargin">0,-1,20,0</Thickness>
     <Thickness x:Key="NavigationViewCompactItemContentPresenterMargin">0,0,0,0</Thickness>
-    <Thickness x:Key="TopNavigationViewItemContentPresenterMargin">8,0,16,0</Thickness>
+    <Thickness x:Key="TopNavigationViewItemContentPresenterMargin">8,-1,16,0</Thickness>
     <Thickness x:Key="TopNavigationViewItemContentOnlyContentPresenterMargin">12,0</Thickness>
     <Thickness x:Key="NavigationViewItemExpandChevronMargin">-20,0,6,0</Thickness>
     <Thickness x:Key="TopNavigationViewItemExpandChevronMargin">-16,0,0,0</Thickness>

diff --git a/test/MUXControlsTestApp/verification/NavigationViewAuto-10.xml b/test/MUXControlsTestApp/verification/NavigationViewAuto-10.xml
@@ -1016,7 +1016,7 @@
                                               FocusVisualSecondaryBrush=#B3FFFFFF
                                               FocusVisualSecondaryThickness=1,1,1,1
                                               Foreground=#E4000000
-                                              Margin=4,-1,8,-1
+                                              Margin=4,-1,8,0
                                               Name=ContentPresenter
                                               Padding=0,0,0,0
                                               RenderSize=46,19
@@ -1253,7 +1253,7 @@
                                               FocusVisualSecondaryBrush=#B3FFFFFF
                                               FocusVisualSecondaryThickness=1,1,1,1
                                               Foreground=#E4000000
-                                              Margin=4,-1,8,-1
+                                              Margin=4,-1,8,0
                                               Name=ContentPresenter
                                               Padding=0,0,0,0
                                               RenderSize=46,19
@@ -1697,7 +1697,7 @@
                                               FocusVisualSecondaryBrush=#B3FFFFFF
                                               FocusVisualSecondaryThickness=1,1,1,1
                                               Foreground=#E4000000
-                                              Margin=4,-1,8,-1
+                                              Margin=4,-1,8,0
                                               Name=ContentPresenter
                                               Padding=0,0,0,0
                                               RenderSize=46,19

diff --git a/test/MUXControlsTestApp/verification/NavigationViewAuto-7.xml b/test/MUXControlsTestApp/verification/NavigationViewAuto-7.xml
@@ -1016,7 +1016,7 @@
                                               FocusVisualSecondaryBrush=#B3FFFFFF
                                               FocusVisualSecondaryThickness=1,1,1,1
                                               Foreground=#E4000000
-                                              Margin=4,-1,8,-1
+                                              Margin=4,-1,8,0
                                               Name=ContentPresenter
                                               Padding=0,0,0,0
                                               RenderSize=46,19
@@ -1253,7 +1253,7 @@
                                               FocusVisualSecondaryBrush=#B3FFFFFF
                                               FocusVisualSecondaryThickness=1,1,1,1
                                               Foreground=#E4000000
-                                              Margin=4,-1,8,-1
+                                              Margin=4,-1,8,0
                                               Name=ContentPresenter
                                               Padding=0,0,0,0
                                               RenderSize=46,19
@@ -1697,7 +1697,7 @@
                                               FocusVisualSecondaryBrush=#B3FFFFFF
                                               FocusVisualSecondaryThickness=1,1,1,1
                                               Foreground=#E4000000
-                                              Margin=4,-1,8,-1
+                                              Margin=4,-1,8,0
                                               Name=ContentPresenter
                                               Padding=0,0,0,0
                                               RenderSize=46,19

diff --git a/test/MUXControlsTestApp/verification/NavigationViewHierarchy-10.xml b/test/MUXControlsTestApp/verification/NavigationViewHierarchy-10.xml
@@ -984,7 +984,7 @@
                                               FocusVisualSecondaryBrush=#B3FFFFFF
                                               FocusVisualSecondaryThickness=1,1,1,1
                                               Foreground=#E4000000
-                                              Margin=4,-1,8,-1
+                                              Margin=4,-1,8,0
                                               Name=ContentPresenter
                                               Padding=0,0,0,0
                                               RenderSize=52,19
@@ -1248,7 +1248,7 @@
                                               FocusVisualSecondaryBrush=#B3FFFFFF
                                               FocusVisualSecondaryThickness=1,1,1,1
                                               Foreground=#E4000000
-                                              Margin=4,-1,8,-1
+                                              Margin=4,-1,8,0
                                               Name=ContentPresenter
                                               Padding=0,0,0,0
                                               RenderSize=78,19
@@ -1692,7 +1692,7 @@
                                               FocusVisualSecondaryBrush=#B3FFFFFF
                                               FocusVisualSecondaryThickness=1,1,1,1
                                               Foreground=#E4000000
-                                              Margin=4,-1,8,-1
+                                              Margin=4,-1,8,0
                                               Name=ContentPresenter
                                               Padding=0,0,0,0
                                               RenderSize=46,19