Merge pull request #1399 from unoplatform/mergify/bp/release/stable/5…

….0/pr-1398 fix(NavigationView): remove disabledlow brush usages (backport #1398)
unoplatform · Apr 23, 2024 · 722dd33 · 722dd33
2 parents bcbcd2b + bdf4d70
commit 722dd33
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/doc/styles/NavigationView.md b/doc/styles/NavigationView.md
@@ -133,7 +133,7 @@ IsDefaultStyle\*: Styles in this column will be set as the default implicit styl
 | `NavigationViewItemBackgroundSelected`                        | `SolidColorBrush` | `SecondaryContainerBrush`                         |
 | `NavigationViewItemBackgroundSelectedPointerOver`             | `SolidColorBrush` | `OnSurfaceHoverBrush`                             |
 | `NavigationViewItemBackgroundSelectedPressed`                 | `SolidColorBrush` | `OnSurfacePressedBrush`                           |
-| `NavigationViewItemBackgroundSelectedDisabled`                | `SolidColorBrush` | `OnSurfaceDisabledLowBrush`                       |
+| `NavigationViewItemBackgroundSelectedDisabled`                | `SolidColorBrush` | `OnSurfaceDisabledBrush`                          |
 | `NavigationViewItemForeground`                                | `SolidColorBrush` | `OnSurfaceBrush`                                  |
 | `NavigationViewItemForegroundPointerOver`                     | `SolidColorBrush` | `SystemControlTransparentBrush`                   |
 | `NavigationViewItemForegroundPressed`                         | `SolidColorBrush` | `SystemControlTransparentBrush`                   |

diff --git a/src/library/Uno.Material/Styles/Controls/v2/NavigationView.xaml b/src/library/Uno.Material/Styles/Controls/v2/NavigationView.xaml
@@ -187,7 +187,7 @@
 			<StaticResource x:Key="NavigationViewItemBackgroundSelected" ResourceKey="SecondaryContainerBrush" />
 			<StaticResource x:Key="NavigationViewItemBackgroundSelectedPointerOver" ResourceKey="OnSurfaceHoverBrush" />
 			<StaticResource x:Key="NavigationViewItemBackgroundSelectedPressed" ResourceKey="OnSurfacePressedBrush" />
-			<StaticResource x:Key="NavigationViewItemBackgroundSelectedDisabled" ResourceKey="OnSurfaceDisabledLowBrush" />
+			<StaticResource x:Key="NavigationViewItemBackgroundSelectedDisabled" ResourceKey="OnSurfaceDisabledBrush" />
 
 			<StaticResource x:Key="NavigationViewItemForeground" ResourceKey="OnSurfaceBrush" />
 			<StaticResource x:Key="NavigationViewItemForegroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
@@ -381,7 +381,7 @@
 			<StaticResource x:Key="NavigationViewItemBackgroundSelected" ResourceKey="SecondaryContainerBrush" />
 			<StaticResource x:Key="NavigationViewItemBackgroundSelectedPointerOver" ResourceKey="OnSurfaceHoverBrush" />
 			<StaticResource x:Key="NavigationViewItemBackgroundSelectedPressed" ResourceKey="OnSurfacePressedBrush" />
-			<StaticResource x:Key="NavigationViewItemBackgroundSelectedDisabled" ResourceKey="OnSurfaceDisabledLowBrush" />
+			<StaticResource x:Key="NavigationViewItemBackgroundSelectedDisabled" ResourceKey="OnSurfaceDisabledBrush" />
 
 			<StaticResource x:Key="NavigationViewItemForeground" ResourceKey="OnSurfaceBrush" />
 			<StaticResource x:Key="NavigationViewItemForegroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
@@ -575,7 +575,7 @@
 			<StaticResource x:Key="NavigationViewItemBackgroundSelected" ResourceKey="SecondaryContainerBrush" />
 			<StaticResource x:Key="NavigationViewItemBackgroundSelectedPointerOver" ResourceKey="OnSurfaceHoverBrush" />
 			<StaticResource x:Key="NavigationViewItemBackgroundSelectedPressed" ResourceKey="OnSurfacePressedBrush" />
-			<StaticResource x:Key="NavigationViewItemBackgroundSelectedDisabled" ResourceKey="OnSurfaceDisabledLowBrush" />
+			<StaticResource x:Key="NavigationViewItemBackgroundSelectedDisabled" ResourceKey="OnSurfaceDisabledBrush" />
 
 			<StaticResource x:Key="NavigationViewItemForeground" ResourceKey="OnSurfaceBrush" />
 			<StaticResource x:Key="NavigationViewItemForegroundPointerOver" ResourceKey="SystemControlTransparentBrush" />