From 9d4d71463a2cfd98692d984b820b2ea382bd2cc5 Mon Sep 17 00:00:00 2001
From: Yimeng Wu <me@kinnara.cn>
Date: Sat, 9 Dec 2023 23:39:27 +0000
Subject: [PATCH 1/3] Port microsoft/microsoft-ui-xaml#4715 (#645)

---
 ModernWpf.Controls/CommandBar/CommandBar.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ModernWpf.Controls/CommandBar/CommandBar.xaml b/ModernWpf.Controls/CommandBar/CommandBar.xaml
index d9fa8260..2dc6bd31 100644
--- a/ModernWpf.Controls/CommandBar/CommandBar.xaml
+++ b/ModernWpf.Controls/CommandBar/CommandBar.xaml
@@ -55,7 +55,6 @@
                         <Grid
                             x:Name="ContentRoot"
                             VerticalAlignment="Top"
-                            Margin="{TemplateBinding Padding}"
                             Height="{TemplateBinding Height}"
                             MinHeight="{DynamicResource AppBarThemeCompactHeight}"
                             Background="{TemplateBinding Background}">
@@ -74,6 +73,7 @@
                                 -->
                                 <ContentControl
                                     x:Name="ContentControl"
+                                    Margin="{TemplateBinding Padding}"
                                     Content="{TemplateBinding Header}"
                                     ContentTemplate="{TemplateBinding HeaderTemplate}"
                                     Foreground="{TemplateBinding Foreground}"

From 8e8aafe32d6ebe59500d9dc83211582ba5fe5b16 Mon Sep 17 00:00:00 2001
From: Yimeng Wu <me@kinnara.cn>
Date: Sat, 9 Dec 2023 23:41:40 +0000
Subject: [PATCH 2/3] Port microsoft/microsoft-ui-xaml#4778 (#646)

---
 ModernWpf/ThemeResources/Dark.xaml  | 2 +-
 ModernWpf/ThemeResources/Light.xaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ModernWpf/ThemeResources/Dark.xaml b/ModernWpf/ThemeResources/Dark.xaml
index 48499092..3f51d9d4 100644
--- a/ModernWpf/ThemeResources/Dark.xaml
+++ b/ModernWpf/ThemeResources/Dark.xaml
@@ -271,7 +271,7 @@
 
     <Color x:Key="SmokeFillColorDefault">#332C2C2C</Color>
 
-    <Color x:Key="LayerFillColorDefault">#09FFFFFF</Color>
+    <Color x:Key="LayerFillColorDefault">#4C3A3A3A</Color>
     <Color x:Key="LayerFillColorAlt">#0DFFFFFF</Color>
     <Color x:Key="LayerOnAcrylicFillColorDefault">#09FFFFFF</Color>
     <Color x:Key="LayerOnAccentAcrylicFillColorDefault">#09FFFFFF</Color>
diff --git a/ModernWpf/ThemeResources/Light.xaml b/ModernWpf/ThemeResources/Light.xaml
index c1c0d087..575893a5 100644
--- a/ModernWpf/ThemeResources/Light.xaml
+++ b/ModernWpf/ThemeResources/Light.xaml
@@ -200,7 +200,7 @@
     <!-- Colors -->
 
     <Color x:Key="TextFillColorPrimary">#E4000000</Color>
-    <Color x:Key="TextFillColorSecondary">#93000000</Color>
+    <Color x:Key="TextFillColorSecondary">#9E000000</Color>
     <Color x:Key="TextFillColorTertiary">#72000000</Color>
     <Color x:Key="TextFillColorDisabled">#5C000000</Color>
     <Color x:Key="TextFillColorInverse">#FFFFFF</Color>

From de437bd46ad0eb772de5e3762a808fd3c58ae0d7 Mon Sep 17 00:00:00 2001
From: Yimeng Wu <me@kinnara.cn>
Date: Sat, 9 Dec 2023 23:45:19 +0000
Subject: [PATCH 3/3] Port microsoft/microsoft-ui-xaml#4810 (#647)

---
 ModernWpf/ThemeResources/Dark.xaml  | 2 +-
 ModernWpf/ThemeResources/Light.xaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ModernWpf/ThemeResources/Dark.xaml b/ModernWpf/ThemeResources/Dark.xaml
index 3f51d9d4..8a2d6895 100644
--- a/ModernWpf/ThemeResources/Dark.xaml
+++ b/ModernWpf/ThemeResources/Dark.xaml
@@ -1304,7 +1304,7 @@
 
     <!-- Resources for ProgressRing -->
     <m:StaticResource x:Key="ProgressRingForegroundThemeBrush" ResourceKey="AccentFillColorDefaultBrush" />
-    <m:StaticResource x:Key="ProgressRingBackgroundThemeBrush" ResourceKey="ControlFillColorTertiaryBrush" />
+    <m:StaticResource x:Key="ProgressRingBackgroundThemeBrush" ResourceKey="ControlFillColorTransparentBrush" />
 
     <!-- Resources for RadioButton -->
     <sys:Double x:Key="RadioButtonBorderThemeThickness">1</sys:Double>
diff --git a/ModernWpf/ThemeResources/Light.xaml b/ModernWpf/ThemeResources/Light.xaml
index 575893a5..a8af16fb 100644
--- a/ModernWpf/ThemeResources/Light.xaml
+++ b/ModernWpf/ThemeResources/Light.xaml
@@ -1307,7 +1307,7 @@
 
     <!-- Resources for ProgressRing -->
     <m:StaticResource x:Key="ProgressRingForegroundThemeBrush" ResourceKey="AccentFillColorDefaultBrush" />
-    <m:StaticResource x:Key="ProgressRingBackgroundThemeBrush" ResourceKey="ControlFillColorTertiaryBrush" />
+    <m:StaticResource x:Key="ProgressRingBackgroundThemeBrush" ResourceKey="ControlFillColorTransparentBrush" />
 
     <!-- Resources for RadioButton -->
     <sys:Double x:Key="RadioButtonBorderThemeThickness">1</sys:Double>