Add Opaque Background to NavigationView ContentGrid (#4707)

* add NavigationViewContentBackground to contentGrid * update verification files
microsoft · Apr 2, 2021 · 8fc91ee · 8fc91ee
1 parent bb55f85
commit 8fc91ee
Show file tree

Hide file tree

Showing 37 changed files with 39 additions and 36 deletions.
diff --git a/dev/NavigationView/NavigationView.xaml b/dev/NavigationView/NavigationView.xaml
@@ -552,7 +552,7 @@
                                 </SplitView.Pane>
 
                                 <SplitView.Content>
-                                    <Grid x:Name="ContentGrid">
+                                    <Grid x:Name="ContentGrid" Background="{ThemeResource NavigationViewContentBackground}">
                                         <Grid.RowDefinitions>
                                             <RowDefinition Height="Auto" />
                                             <RowDefinition Height="Auto" />

diff --git a/dev/NavigationView/NavigationView_rs1_themeresources.xaml b/dev/NavigationView/NavigationView_rs1_themeresources.xaml
@@ -16,6 +16,7 @@
             <StaticResource x:Key="NavigationViewDefaultPaneBackground" ResourceKey="SolidBackgroundFillColorBaseBrush" />
             <StaticResource x:Key="NavigationViewExpandedPaneBackground" ResourceKey="ControlFillColorTransparentBrush" />
             <StaticResource x:Key="NavigationViewTopPaneBackground" ResourceKey="SolidBackgroundFillColorBaseBrush" />
+            <StaticResource x:Key="NavigationViewContentBackground" ResourceKey="SolidBackgroundFillColorBaseBrush" />
 
             <StaticResource x:Key="NavigationViewItemBackground" ResourceKey="SubtleFillColorTransparentBrush" />
             <StaticResource x:Key="NavigationViewItemBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
@@ -88,6 +89,7 @@
             <StaticResource x:Key="NavigationViewDefaultPaneBackground" ResourceKey="SolidBackgroundFillColorBaseBrush" />
             <StaticResource x:Key="NavigationViewExpandedPaneBackground" ResourceKey="ControlFillColorTransparentBrush" />
             <StaticResource x:Key="NavigationViewTopPaneBackground" ResourceKey="SolidBackgroundFillColorBaseBrush" />
+            <StaticResource x:Key="NavigationViewContentBackground" ResourceKey="SolidBackgroundFillColorBaseBrush" />
 
             <StaticResource x:Key="NavigationViewItemBackground" ResourceKey="SubtleFillColorTransparentBrush" />
             <StaticResource x:Key="NavigationViewItemBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
@@ -160,6 +162,7 @@
             <StaticResource x:Key="NavigationViewDefaultPaneBackground" ResourceKey="SystemChromeMediumColor" />
             <StaticResource x:Key="NavigationViewExpandedPaneBackground" ResourceKey="SystemColorWindowColor" />
             <StaticResource x:Key="NavigationViewTopPaneBackground" ResourceKey="SystemChromeMediumHighColor" />
+            <StaticResource x:Key="NavigationViewContentBackground" ResourceKey="SystemChromeMediumColor" />
 
             <StaticResource x:Key="NavigationViewItemBackground" ResourceKey="SystemControlBackgroundBaseLowBrush" />
             <StaticResource x:Key="NavigationViewItemBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowBrush" />

diff --git a/test/MUXControlsTestApp/verification/NavigationViewAuto-4.xml b/test/MUXControlsTestApp/verification/NavigationViewAuto-4.xml
@@ -2467,7 +2467,7 @@
                   CornerRadius=0,0,0,0
                   BorderThickness=0,0,0,0
                   BorderBrush=[NULL]
-                  Background=[NULL]
+                  Background=#FFF3F3F3
                   Name=ContentGrid
                   Margin=0,0,0,0
                   FocusVisualSecondaryThickness=1,1,1,1

diff --git a/test/MUXControlsTestApp/verification/NavigationViewAuto-5.xml b/test/MUXControlsTestApp/verification/NavigationViewAuto-5.xml
@@ -2467,7 +2467,7 @@
                   CornerRadius=0,0,0,0
                   BorderThickness=0,0,0,0
                   BorderBrush=[NULL]
-                  Background=[NULL]
+                  Background=#FFF3F3F3
                   Name=ContentGrid
                   Margin=0,0,0,0
                   FocusVisualSecondaryThickness=1,1,1,1

diff --git a/test/MUXControlsTestApp/verification/NavigationViewAuto-6.xml b/test/MUXControlsTestApp/verification/NavigationViewAuto-6.xml
@@ -2467,7 +2467,7 @@
                   CornerRadius=0,0,0,0
                   BorderThickness=0,0,0,0
                   BorderBrush=[NULL]
-                  Background=[NULL]
+                  Background=#FFF3F3F3
                   Name=ContentGrid
                   Margin=0,0,0,0
                   FocusVisualSecondaryThickness=1,1,1,1

diff --git a/test/MUXControlsTestApp/verification/NavigationViewAuto-7.xml b/test/MUXControlsTestApp/verification/NavigationViewAuto-7.xml
@@ -2380,7 +2380,7 @@
                   CornerRadius=0,0,0,0
                   BorderThickness=0,0,0,0
                   BorderBrush=[NULL]
-                  Background=[NULL]
+                  Background=#FFF3F3F3
                   Name=ContentGrid
                   Margin=0,0,0,0
                   FocusVisualSecondaryThickness=1,1,1,1

diff --git a/test/MUXControlsTestApp/verification/NavigationViewAuto-8.xml b/test/MUXControlsTestApp/verification/NavigationViewAuto-8.xml
@@ -2380,7 +2380,7 @@
                   CornerRadius=0,0,0,0
                   BorderThickness=0,0,0,0
                   BorderBrush=[NULL]
-                  Background=[NULL]
+                  Background=#FFF3F3F3
                   Name=ContentGrid
                   Margin=0,0,0,0
                   FocusVisualSecondaryThickness=1,1,1,1

diff --git a/test/MUXControlsTestApp/verification/NavigationViewLeftCompact-4.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftCompact-4.xml
@@ -2388,7 +2388,7 @@
                   CornerRadius=0,0,0,0
                   BorderThickness=0,0,0,0
                   BorderBrush=[NULL]
-                  Background=[NULL]
+                  Background=#FFF3F3F3
                   Name=ContentGrid
                   Margin=0,0,0,0
                   FocusVisualSecondaryThickness=1,1,1,1

diff --git a/test/MUXControlsTestApp/verification/NavigationViewLeftCompact-5.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftCompact-5.xml
@@ -2388,7 +2388,7 @@
                   CornerRadius=0,0,0,0
                   BorderThickness=0,0,0,0
                   BorderBrush=[NULL]
-                  Background=[NULL]
+                  Background=#FFF3F3F3
                   Name=ContentGrid
                   Margin=0,0,0,0
                   FocusVisualSecondaryThickness=1,1,1,1

diff --git a/test/MUXControlsTestApp/verification/NavigationViewLeftCompact-6.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftCompact-6.xml
@@ -2388,7 +2388,7 @@
                   CornerRadius=0,0,0,0
                   BorderThickness=0,0,0,0
                   BorderBrush=[NULL]
-                  Background=[NULL]
+                  Background=#FFF3F3F3
                   Name=ContentGrid
                   Margin=0,0,0,0
                   FocusVisualSecondaryThickness=1,1,1,1

diff --git a/test/MUXControlsTestApp/verification/NavigationViewLeftCompact-7.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftCompact-7.xml
@@ -2333,7 +2333,7 @@
                   CornerRadius=0,0,0,0
                   BorderThickness=0,0,0,0
                   BorderBrush=[NULL]
-                  Background=[NULL]
+                  Background=#FFF3F3F3
                   Name=ContentGrid
                   Margin=0,0,0,0
                   FocusVisualSecondaryThickness=1,1,1,1

diff --git a/test/MUXControlsTestApp/verification/NavigationViewLeftCompact-8.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftCompact-8.xml
@@ -2333,7 +2333,7 @@
                   CornerRadius=0,0,0,0
                   BorderThickness=0,0,0,0
                   BorderBrush=[NULL]
-                  Background=[NULL]
+                  Background=#FFF3F3F3
                   Name=ContentGrid
                   Margin=0,0,0,0
                   FocusVisualSecondaryThickness=1,1,1,1

diff --git a/test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-4.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-4.xml
@@ -2467,7 +2467,7 @@
                   CornerRadius=0,0,0,0
                   BorderThickness=0,0,0,0
                   BorderBrush=[NULL]
-                  Background=[NULL]
+                  Background=#FFF3F3F3
                   Name=ContentGrid
                   Margin=0,0,0,0
                   FocusVisualSecondaryThickness=1,1,1,1

diff --git a/test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-5.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-5.xml
@@ -2467,7 +2467,7 @@
                   CornerRadius=0,0,0,0
                   BorderThickness=0,0,0,0
                   BorderBrush=[NULL]
-                  Background=[NULL]
+                  Background=#FFF3F3F3
                   Name=ContentGrid
                   Margin=0,0,0,0
                   FocusVisualSecondaryThickness=1,1,1,1

diff --git a/test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-6.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-6.xml
@@ -2467,7 +2467,7 @@
                   CornerRadius=0,0,0,0
                   BorderThickness=0,0,0,0
                   BorderBrush=[NULL]
-                  Background=[NULL]
+                  Background=#FFF3F3F3
                   Name=ContentGrid
                   Margin=0,0,0,0
                   FocusVisualSecondaryThickness=1,1,1,1

diff --git a/test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-7.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-7.xml
@@ -2380,7 +2380,7 @@
                   CornerRadius=0,0,0,0
                   BorderThickness=0,0,0,0
                   BorderBrush=[NULL]
-                  Background=[NULL]
+                  Background=#FFF3F3F3
                   Name=ContentGrid
                   Margin=0,0,0,0
                   FocusVisualSecondaryThickness=1,1,1,1

diff --git a/test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-8.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-8.xml
@@ -2380,7 +2380,7 @@
                   CornerRadius=0,0,0,0
                   BorderThickness=0,0,0,0
                   BorderBrush=[NULL]
-                  Background=[NULL]
+                  Background=#FFF3F3F3
                   Name=ContentGrid
                   Margin=0,0,0,0
                   FocusVisualSecondaryThickness=1,1,1,1

diff --git a/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-4.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-4.xml
@@ -2779,7 +2779,7 @@
                   CornerRadius=0,0,0,0
                   BorderThickness=0,0,0,0
                   BorderBrush=[NULL]
-                  Background=[NULL]
+                  Background=#FFF3F3F3
                   Name=ContentGrid
                   Margin=0,0,0,0
                   FocusVisualSecondaryThickness=1,1,1,1

diff --git a/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-5.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-5.xml
@@ -2779,7 +2779,7 @@
                   CornerRadius=0,0,0,0
                   BorderThickness=0,0,0,0
                   BorderBrush=[NULL]
-                  Background=[NULL]
+                  Background=#FFF3F3F3
                   Name=ContentGrid
                   Margin=0,0,0,0
                   FocusVisualSecondaryThickness=1,1,1,1

diff --git a/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-6.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-6.xml
@@ -2779,7 +2779,7 @@
                   CornerRadius=0,0,0,0
                   BorderThickness=0,0,0,0
                   BorderBrush=[NULL]
-                  Background=[NULL]
+                  Background=#FFF3F3F3
                   Name=ContentGrid
                   Margin=0,0,0,0
                   FocusVisualSecondaryThickness=1,1,1,1

diff --git a/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-7.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-7.xml
@@ -2749,7 +2749,7 @@
                   CornerRadius=0,0,0,0
                   BorderThickness=0,0,0,0
                   BorderBrush=[NULL]
-                  Background=[NULL]
+                  Background=#FFF3F3F3
                   Name=ContentGrid
                   Margin=0,0,0,0
                   FocusVisualSecondaryThickness=1,1,1,1

diff --git a/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-8.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-8.xml
@@ -2749,7 +2749,7 @@
                   CornerRadius=0,0,0,0
                   BorderThickness=0,0,0,0
                   BorderBrush=[NULL]
-                  Background=[NULL]
+                  Background=#FFF3F3F3
                   Name=ContentGrid
                   Margin=0,0,0,0
                   FocusVisualSecondaryThickness=1,1,1,1

diff --git a/test/MUXControlsTestApp/verification/NavigationViewScrolling-4.xml b/test/MUXControlsTestApp/verification/NavigationViewScrolling-4.xml
@@ -5308,7 +5308,7 @@
                   CornerRadius=0,0,0,0
                   BorderThickness=0,0,0,0
                   BorderBrush=[NULL]
-                  Background=[NULL]
+                  Background=#FFF3F3F3
                   Name=ContentGrid
                   Margin=0,0,0,0
                   FocusVisualSecondaryThickness=1,1,1,1

diff --git a/test/MUXControlsTestApp/verification/NavigationViewScrolling-5.xml b/test/MUXControlsTestApp/verification/NavigationViewScrolling-5.xml
@@ -5308,7 +5308,7 @@
                   CornerRadius=0,0,0,0
                   BorderThickness=0,0,0,0
                   BorderBrush=[NULL]
-                  Background=[NULL]
+                  Background=#FFF3F3F3
                   Name=ContentGrid
                   Margin=0,0,0,0
                   FocusVisualSecondaryThickness=1,1,1,1

diff --git a/test/MUXControlsTestApp/verification/NavigationViewScrolling-6.xml b/test/MUXControlsTestApp/verification/NavigationViewScrolling-6.xml
@@ -5308,7 +5308,7 @@
                   CornerRadius=0,0,0,0
                   BorderThickness=0,0,0,0
                   BorderBrush=[NULL]
-                  Background=[NULL]
+                  Background=#FFF3F3F3
                   Name=ContentGrid
                   Margin=0,0,0,0
                   FocusVisualSecondaryThickness=1,1,1,1

diff --git a/test/MUXControlsTestApp/verification/NavigationViewScrolling-7.xml b/test/MUXControlsTestApp/verification/NavigationViewScrolling-7.xml
@@ -5285,7 +5285,7 @@
                   CornerRadius=0,0,0,0
                   BorderThickness=0,0,0,0
                   BorderBrush=[NULL]
-                  Background=[NULL]
+                  Background=#FFF3F3F3
                   Name=ContentGrid
                   Margin=0,0,0,0
                   FocusVisualSecondaryThickness=1,1,1,1

diff --git a/test/MUXControlsTestApp/verification/NavigationViewScrolling-8.xml b/test/MUXControlsTestApp/verification/NavigationViewScrolling-8.xml
@@ -5285,7 +5285,7 @@
                   CornerRadius=0,0,0,0
                   BorderThickness=0,0,0,0
                   BorderBrush=[NULL]
-                  Background=[NULL]
+                  Background=#FFF3F3F3
                   Name=ContentGrid
                   Margin=0,0,0,0
                   FocusVisualSecondaryThickness=1,1,1,1

diff --git a/test/MUXControlsTestApp/verification/NavigationViewTop-4.xml b/test/MUXControlsTestApp/verification/NavigationViewTop-4.xml
@@ -1664,7 +1664,7 @@
                   CornerRadius=0,0,0,0
                   BorderThickness=0,0,0,0
                   BorderBrush=[NULL]
-                  Background=[NULL]
+                  Background=#FFF3F3F3
                   Name=ContentGrid
                   Margin=0,0,0,0
                   FocusVisualSecondaryThickness=1,1,1,1

diff --git a/test/MUXControlsTestApp/verification/NavigationViewTop-5.xml b/test/MUXControlsTestApp/verification/NavigationViewTop-5.xml
@@ -1664,7 +1664,7 @@
                   CornerRadius=0,0,0,0
                   BorderThickness=0,0,0,0
                   BorderBrush=[NULL]
-                  Background=[NULL]
+                  Background=#FFF3F3F3
                   Name=ContentGrid
                   Margin=0,0,0,0
                   FocusVisualSecondaryThickness=1,1,1,1

diff --git a/test/MUXControlsTestApp/verification/NavigationViewTop-6.xml b/test/MUXControlsTestApp/verification/NavigationViewTop-6.xml
@@ -1664,7 +1664,7 @@
                   CornerRadius=0,0,0,0
                   BorderThickness=0,0,0,0
                   BorderBrush=[NULL]
-                  Background=[NULL]
+                  Background=#FFF3F3F3
                   Name=ContentGrid
                   Margin=0,0,0,0
                   FocusVisualSecondaryThickness=1,1,1,1

diff --git a/test/MUXControlsTestApp/verification/NavigationViewTop-7.xml b/test/MUXControlsTestApp/verification/NavigationViewTop-7.xml
@@ -1629,7 +1629,7 @@
                   CornerRadius=0,0,0,0
                   BorderThickness=0,0,0,0
                   BorderBrush=[NULL]
-                  Background=[NULL]
+                  Background=#FFF3F3F3
                   Name=ContentGrid
                   Margin=0,0,0,0
                   FocusVisualSecondaryThickness=1,1,1,1

diff --git a/test/MUXControlsTestApp/verification/NavigationViewTop-8.xml b/test/MUXControlsTestApp/verification/NavigationViewTop-8.xml
@@ -1629,7 +1629,7 @@
                   CornerRadius=0,0,0,0
                   BorderThickness=0,0,0,0
                   BorderBrush=[NULL]
-                  Background=[NULL]
+                  Background=#FFF3F3F3
                   Name=ContentGrid
                   Margin=0,0,0,0
                   FocusVisualSecondaryThickness=1,1,1,1

diff --git a/test/MUXControlsTestApp/verification/NavigationViewTopPaneContent-4.xml b/test/MUXControlsTestApp/verification/NavigationViewTopPaneContent-4.xml
@@ -2056,7 +2056,7 @@
                   CornerRadius=0,0,0,0
                   BorderThickness=0,0,0,0
                   BorderBrush=[NULL]
-                  Background=[NULL]
+                  Background=#FFF3F3F3
                   Name=ContentGrid
                   Margin=0,0,0,0
                   FocusVisualSecondaryThickness=1,1,1,1

diff --git a/test/MUXControlsTestApp/verification/NavigationViewTopPaneContent-5.xml b/test/MUXControlsTestApp/verification/NavigationViewTopPaneContent-5.xml
@@ -2056,7 +2056,7 @@
                   CornerRadius=0,0,0,0
                   BorderThickness=0,0,0,0
                   BorderBrush=[NULL]
-                  Background=[NULL]
+                  Background=#FFF3F3F3
                   Name=ContentGrid
                   Margin=0,0,0,0
                   FocusVisualSecondaryThickness=1,1,1,1

diff --git a/test/MUXControlsTestApp/verification/NavigationViewTopPaneContent-6.xml b/test/MUXControlsTestApp/verification/NavigationViewTopPaneContent-6.xml
@@ -2056,7 +2056,7 @@
                   CornerRadius=0,0,0,0
                   BorderThickness=0,0,0,0
                   BorderBrush=[NULL]
-                  Background=[NULL]
+                  Background=#FFF3F3F3
                   Name=ContentGrid
                   Margin=0,0,0,0
                   FocusVisualSecondaryThickness=1,1,1,1

diff --git a/test/MUXControlsTestApp/verification/NavigationViewTopPaneContent-7.xml b/test/MUXControlsTestApp/verification/NavigationViewTopPaneContent-7.xml
@@ -2046,7 +2046,7 @@
                   CornerRadius=0,0,0,0
                   BorderThickness=0,0,0,0
                   BorderBrush=[NULL]
-                  Background=[NULL]
+                  Background=#FFF3F3F3
                   Name=ContentGrid
                   Margin=0,0,0,0
                   FocusVisualSecondaryThickness=1,1,1,1

diff --git a/test/MUXControlsTestApp/verification/NavigationViewTopPaneContent-8.xml b/test/MUXControlsTestApp/verification/NavigationViewTopPaneContent-8.xml
@@ -2046,7 +2046,7 @@
                   CornerRadius=0,0,0,0
                   BorderThickness=0,0,0,0
                   BorderBrush=[NULL]
-                  Background=[NULL]
+                  Background=#FFF3F3F3
                   Name=ContentGrid
                   Margin=0,0,0,0
                   FocusVisualSecondaryThickness=1,1,1,1