From 65a4315cd0ef70aaa520bc360dbe49624521d00c Mon Sep 17 00:00:00 2001
From: robloo <robloo@users.noreply.github.com>
Date: Sun, 23 Oct 2022 21:26:35 -0400
Subject: [PATCH] Use standard resource names

---
 .../Accents/FluentControlResourcesDark.xaml   | 20 +++++++++----------
 .../Accents/FluentControlResourcesLight.xaml  | 20 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml
index 60d83a3ecf..d2738c231f 100644
--- a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml
@@ -311,21 +311,21 @@
     <StaticResource x:Key="ExpanderHeaderForeground" ResourceKey="SystemBaseHighColor" />
     <StaticResource x:Key="ExpanderHeaderForegroundPointerOver" ResourceKey="SystemBaseHighColor" />
     <StaticResource x:Key="ExpanderHeaderForegroundPressed" ResourceKey="SystemBaseHighColor" />
+    <StaticResource x:Key="ExpanderHeaderForegroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledLowBrush" />
     <StaticResource x:Key="ExpanderHeaderBorderBrush" ResourceKey="SystemBaseLowColor" />
-    <StaticResource x:Key="ExpanderHeaderBorderPointerOverBrush" ResourceKey="SystemBaseLowColor" />
-    <StaticResource x:Key="ExpanderHeaderBorderPressedBrush" ResourceKey="SystemBaseLowColor" />
-    <StaticResource x:Key="ExpanderHeaderDisabledForeground" ResourceKey="SystemControlDisabledChromeDisabledLowBrush" />
-    <StaticResource x:Key="ExpanderHeaderDisabledBorderBrush" ResourceKey="SystemControlDisabledBaseLowBrush" />
+    <StaticResource x:Key="ExpanderHeaderBorderBrushPointerOver" ResourceKey="SystemBaseLowColor" />
+    <StaticResource x:Key="ExpanderHeaderBorderBrushPressed" ResourceKey="SystemBaseLowColor" />
+    <StaticResource x:Key="ExpanderHeaderBorderBrushDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
 
     <SolidColorBrush x:Key="ExpanderChevronBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ExpanderChevronPointerOverBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ExpanderChevronPressedBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="ExpanderChevronBackgroundPointerOver" Color="Transparent" />
+    <SolidColorBrush x:Key="ExpanderChevronBackgroundPressed" Color="Transparent" />
     <StaticResource x:Key="ExpanderChevronForeground" ResourceKey="SystemBaseHighColor" />
-    <StaticResource x:Key="ExpanderChevronPointerOverForeground" ResourceKey="SystemBaseHighColor" />
-    <StaticResource x:Key="ExpanderChevronPressedForeground" ResourceKey="SystemBaseHighColor" />
+    <StaticResource x:Key="ExpanderChevronForegroundPointerOver" ResourceKey="SystemBaseHighColor" />
+    <StaticResource x:Key="ExpanderChevronForegroundPressed" ResourceKey="SystemBaseHighColor" />
     <SolidColorBrush x:Key="ExpanderChevronBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="ExpanderChevronBorderPointerOverBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="ExpanderChevronBorderPressedBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ExpanderChevronBorderBrushPointerOver" Color="Transparent" />
+    <SolidColorBrush x:Key="ExpanderChevronBorderBrushPressed" Color="Transparent" />
 
     <!-- Expander:Content -->
     <StaticResource x:Key="ExpanderContentBackground" ResourceKey="SystemChromeMediumLowColor" />
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml
index 632ffe6ace..5a9293f7b2 100644
--- a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml
@@ -308,21 +308,21 @@
     <StaticResource x:Key="ExpanderHeaderForeground" ResourceKey="SystemBaseHighColor" />
     <StaticResource x:Key="ExpanderHeaderForegroundPointerOver" ResourceKey="SystemBaseHighColor" />
     <StaticResource x:Key="ExpanderHeaderForegroundPressed" ResourceKey="SystemBaseHighColor" />
+    <StaticResource x:Key="ExpanderHeaderForegroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledLowBrush" />
     <StaticResource x:Key="ExpanderHeaderBorderBrush" ResourceKey="SystemBaseLowColor" />
-    <StaticResource x:Key="ExpanderHeaderBorderPointerOverBrush" ResourceKey="SystemBaseLowColor" />
-    <StaticResource x:Key="ExpanderHeaderBorderPressedBrush" ResourceKey="SystemBaseLowColor" />
-    <StaticResource x:Key="ExpanderHeaderDisabledForeground" ResourceKey="SystemControlDisabledChromeDisabledLowBrush" />
-    <StaticResource x:Key="ExpanderHeaderDisabledBorderBrush" ResourceKey="SystemControlDisabledBaseLowBrush" />
+    <StaticResource x:Key="ExpanderHeaderBorderBrushPointerOver" ResourceKey="SystemBaseLowColor" />
+    <StaticResource x:Key="ExpanderHeaderBorderBrushPressed" ResourceKey="SystemBaseLowColor" />
+    <StaticResource x:Key="ExpanderHeaderBorderBrushDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
 
     <SolidColorBrush x:Key="ExpanderChevronBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ExpanderChevronPointerOverBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ExpanderChevronPressedBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="ExpanderChevronBackgroundPointerOver" Color="Transparent" />
+    <SolidColorBrush x:Key="ExpanderChevronBackgroundPressed" Color="Transparent" />
     <StaticResource x:Key="ExpanderChevronForeground" ResourceKey="SystemBaseHighColor" />
-    <StaticResource x:Key="ExpanderChevronPointerOverForeground" ResourceKey="SystemBaseHighColor" />
-    <StaticResource x:Key="ExpanderChevronPressedForeground" ResourceKey="SystemBaseHighColor" />
+    <StaticResource x:Key="ExpanderChevronForegroundPointerOver" ResourceKey="SystemBaseHighColor" />
+    <StaticResource x:Key="ExpanderChevronForegroundPressed" ResourceKey="SystemBaseHighColor" />
     <SolidColorBrush x:Key="ExpanderChevronBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="ExpanderChevronBorderPointerOverBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="ExpanderChevronBorderPressedBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ExpanderChevronBorderBrushPointerOver" Color="Transparent" />
+    <SolidColorBrush x:Key="ExpanderChevronBorderBrushPressed" Color="Transparent" />
 
     <!-- Expander:Content -->
     <StaticResource x:Key="ExpanderContentBackground" ResourceKey="SystemChromeMediumLowColor" />