From bbbc1280ff4f671073ebd033133cea9f62891579 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Sun, 23 Apr 2023 00:44:48 -0400
Subject: [PATCH] Rename RegionBrush to SystemRegionColor and use it in default
 templates

---
 src/Avalonia.Themes.Fluent/Accents/BaseColorsPalette.xaml    | 4 ++--
 src/Avalonia.Themes.Fluent/Accents/BaseResources.xaml        | 4 ++--
 .../ColorPaletteResources.Properties.cs                      | 5 +++++
 .../Controls/EmbeddableControlRoot.xaml                      | 2 +-
 src/Avalonia.Themes.Fluent/Controls/Window.xaml              | 2 +-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Accents/BaseColorsPalette.xaml b/src/Avalonia.Themes.Fluent/Accents/BaseColorsPalette.xaml
index b8b5fcf1f4..362d543646 100644
--- a/src/Avalonia.Themes.Fluent/Accents/BaseColorsPalette.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/BaseColorsPalette.xaml
@@ -29,7 +29,7 @@
       <Color x:Key="SystemListLowColor">#19000000</Color>
       <Color x:Key="SystemListMediumColor">#33000000</Color>
       <Color x:Key="SystemErrorTextColor">#C50500</Color>
-      <Color x:Key="RegionColor">#FFFFFFFF</Color>
+      <Color x:Key="SystemRegionColor">#FFFFFFFF</Color>
       <Color x:Key="SystemRevealListLowColor">#17000000</Color>
       <Color x:Key="SystemRevealListMediumColor">#2E000000</Color>
     </ResourceDictionary>
@@ -60,7 +60,7 @@
       <Color x:Key="SystemListLowColor">#19FFFFFF</Color>
       <Color x:Key="SystemListMediumColor">#33FFFFFF</Color>
       <Color x:Key="SystemErrorTextColor">#FFF000</Color>
-      <Color x:Key="RegionColor">#FF000000</Color>
+      <Color x:Key="SystemRegionColor">#FF000000</Color>
       <Color x:Key="SystemRevealListLowColor">#18FFFFFF</Color>
       <Color x:Key="SystemRevealListMediumColor">#30FFFFFF</Color>
     </ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Accents/BaseResources.xaml b/src/Avalonia.Themes.Fluent/Accents/BaseResources.xaml
index c1f79e45d5..517a80fd7e 100644
--- a/src/Avalonia.Themes.Fluent/Accents/BaseResources.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/BaseResources.xaml
@@ -212,7 +212,7 @@
       <SolidColorBrush x:Key="SystemControlTransparentRevealBackgroundBrush" Color="Transparent" />
       <SolidColorBrush x:Key="SystemControlTransparentRevealBorderBrush" Color="Transparent" />
 
-      <SolidColorBrush x:Key="RegionBrush" Color="{StaticResource RegionColor}" />
+      <SolidColorBrush x:Key="SystemRegionBrush" Color="{StaticResource SystemRegionColor}" />
     </ResourceDictionary>
     <ResourceDictionary x:Key="Dark">
       <SolidColorBrush x:Key="SystemControlBackgroundAccentBrush" Color="{DynamicResource SystemAccentColor}" />
@@ -372,7 +372,7 @@
       <SolidColorBrush x:Key="SystemControlTransparentRevealBackgroundBrush" Color="Transparent" />
       <SolidColorBrush x:Key="SystemControlTransparentRevealBorderBrush" Color="Transparent" />
 
-      <SolidColorBrush x:Key="RegionBrush" Color="{StaticResource RegionColor}" />
+      <SolidColorBrush x:Key="SystemRegionBrush" Color="{StaticResource SystemRegionColor}" />
     </ResourceDictionary>
   </ResourceDictionary.ThemeDictionaries>
 </ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/ColorPaletteResources.Properties.cs b/src/Avalonia.Themes.Fluent/ColorPaletteResources.Properties.cs
index 6d284150e4..366af8e227 100644
--- a/src/Avalonia.Themes.Fluent/ColorPaletteResources.Properties.cs
+++ b/src/Avalonia.Themes.Fluent/ColorPaletteResources.Properties.cs
@@ -150,4 +150,9 @@ public partial class ColorPaletteResources
     /// Gets or sets the ListMedium color value.
     /// </summary>
     public Color ListMedium { get => GetColor("SystemListMediumColor"); set => SetColor("SystemListMediumColor", value); }
+    
+    /// <summary>
+    /// Gets or sets the RegionColor color value.
+    /// </summary>
+    public Color RegionColor { get => GetColor("SystemRegionColor"); set => SetColor("SystemRegionColor", value); }
 }
diff --git a/src/Avalonia.Themes.Fluent/Controls/EmbeddableControlRoot.xaml b/src/Avalonia.Themes.Fluent/Controls/EmbeddableControlRoot.xaml
index f60424a2dc..ee51ef8085 100644
--- a/src/Avalonia.Themes.Fluent/Controls/EmbeddableControlRoot.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/EmbeddableControlRoot.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <ControlTheme x:Key="{x:Type EmbeddableControlRoot}" TargetType="EmbeddableControlRoot">
     <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
-    <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundAltHighBrush}"/>
+    <Setter Property="Background" Value="{DynamicResource SystemRegionBrush}"/>
     <Setter Property="TopLevel.SystemBarColor" Value="{DynamicResource SystemControlBackgroundAltHighBrush}"/>
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
     <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/Window.xaml b/src/Avalonia.Themes.Fluent/Controls/Window.xaml
index ff27cce800..8db01fa4c8 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Window.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Window.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <ControlTheme x:Key="{x:Type Window}" TargetType="Window">
-    <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundAltHighBrush}"/>
+    <Setter Property="Background" Value="{DynamicResource SystemRegionBrush}"/>
     <Setter Property="TransparencyBackgroundFallback" Value="{DynamicResource SystemControlBackgroundAltHighBrush}" />
     <Setter Property="TopLevel.SystemBarColor" Value="{DynamicResource SystemControlBackgroundAltHighBrush}"/>
     <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>