From ef932cd789ef8aeaf075cc16511b2466954e009c Mon Sep 17 00:00:00 2001
From: Mike Griese <migrie@microsoft.com>
Date: Thu, 10 Feb 2022 07:17:28 -0600
Subject: [PATCH 1/3] why does this work but the others don't?

---
 src/cascadia/TerminalApp/App.xaml         | 32 +++++++++++++++++------
 src/cascadia/TerminalApp/TerminalPage.cpp |  1 -
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/cascadia/TerminalApp/App.xaml b/src/cascadia/TerminalApp/App.xaml
index 07273a0151a..22cd0f9849d 100644
--- a/src/cascadia/TerminalApp/App.xaml
+++ b/src/cascadia/TerminalApp/App.xaml
@@ -54,20 +54,36 @@
                     <ResourceDictionary.ThemeDictionaries>
                         <ResourceDictionary x:Key="Dark">
                             <!--  Define resources for Dark mode here  -->
-                            <StaticResource x:Key="TabViewBackground"
-                                            ResourceKey="ApplicationPageBackgroundThemeBrush" />
+                            <!-- <SolidColorBrush x:Key="TabViewBackground"
+                                            Color="{ThemeResource SolidBackgroundFillColorBase}" />-->
+                            <!-- <SolidColorBrush x:Key="TabViewBackground"
+                                            Color="{StaticResource SolidBackgroundFillColorBase}" />-->
+                            <SolidColorBrush x:Key="TabViewBackground"
+                                             Color="#202020" />
+
+
+
+                            <SolidColorBrush x:Key="UnfocusedBorderBrush"
+                                             Color="{ThemeResource ApplicationPageBackgroundThemeBrush}" />
+
 
-                            <StaticResource x:Key="UnfocusedBorderBrush"
-                                            ResourceKey="ApplicationPageBackgroundThemeBrush" />
                         </ResourceDictionary>
 
                         <ResourceDictionary x:Key="Light">
                             <!--  Define resources for Light mode here  -->
-                            <StaticResource x:Key="TabViewBackground"
-                                            ResourceKey="ApplicationPageBackgroundThemeBrush" />
+                            <!-- <SolidColorBrush x:Key="TabViewBackground"
+                                            Color="{ThemeResource SolidBackgroundFillColorBase}" />-->
+                            <!-- <SolidColorBrush x:Key="TabViewBackground"
+                                            Color="{StaticResource SolidBackgroundFillColorBase}" />-->
+                            <SolidColorBrush x:Key="TabViewBackground"
+                                             Color="#F3F3F3" />
+
+
+
+                            <SolidColorBrush x:Key="UnfocusedBorderBrush"
+                                             Color="{ThemeResource ApplicationPageBackgroundThemeBrush}" />
+
 
-                            <StaticResource x:Key="UnfocusedBorderBrush"
-                                            ResourceKey="ApplicationPageBackgroundThemeBrush" />
                         </ResourceDictionary>
 
                     </ResourceDictionary.ThemeDictionaries>
diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp
index 9b08ba85052..e5c382d132b 100644
--- a/src/cascadia/TerminalApp/TerminalPage.cpp
+++ b/src/cascadia/TerminalApp/TerminalPage.cpp
@@ -156,7 +156,6 @@ namespace winrt::TerminalApp::implementation
         if (_settings.GlobalSettings().UseAcrylicInTabRow())
         {
             const auto res = Application::Current().Resources();
-
             const auto lightKey = winrt::box_value(L"Light");
             const auto darkKey = winrt::box_value(L"Dark");
             const auto tabViewBackgroundKey = winrt::box_value(L"TabViewBackground");

From 82dd0e7c43489e917fe22d4b40063b7de6bbfb4d Mon Sep 17 00:00:00 2001
From: Mike Griese <migrie@microsoft.com>
Date: Thu, 10 Feb 2022 07:23:21 -0600
Subject: [PATCH 2/3] comments before I try something stupid

---
 src/cascadia/TerminalApp/App.xaml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/cascadia/TerminalApp/App.xaml b/src/cascadia/TerminalApp/App.xaml
index 22cd0f9849d..bfdd08b1ab1 100644
--- a/src/cascadia/TerminalApp/App.xaml
+++ b/src/cascadia/TerminalApp/App.xaml
@@ -63,25 +63,23 @@
 
 
 
-                            <SolidColorBrush x:Key="UnfocusedBorderBrush"
-                                             Color="{ThemeResource ApplicationPageBackgroundThemeBrush}" />
+                            <StaticResource x:Key="UnfocusedBorderBrush"
+                                            ResourceKey="ApplicationPageBackgroundThemeBrush" />
 
 
                         </ResourceDictionary>
 
                         <ResourceDictionary x:Key="Light">
                             <!--  Define resources for Light mode here  -->
-                            <!-- <SolidColorBrush x:Key="TabViewBackground"
-                                            Color="{ThemeResource SolidBackgroundFillColorBase}" />-->
-                            <!-- <SolidColorBrush x:Key="TabViewBackground"
-                                            Color="{StaticResource SolidBackgroundFillColorBase}" />-->
+
+                            <!--  This is the color of ApplicationPageBackgroundThemeBrush, which is evaluated as SolidBackgroundFillColorBase. If we try to use those resources directly though, we don't get the properly themed versions. Presumably because the App itself can't have it's RequestedTheme changed at runtime.  -->
                             <SolidColorBrush x:Key="TabViewBackground"
                                              Color="#F3F3F3" />
 
 
 
-                            <SolidColorBrush x:Key="UnfocusedBorderBrush"
-                                             Color="{ThemeResource ApplicationPageBackgroundThemeBrush}" />
+                            <StaticResource x:Key="UnfocusedBorderBrush"
+                                            ResourceKey="ApplicationPageBackgroundThemeBrush" />
 
 
                         </ResourceDictionary>

From 2e36459c76d0c54adec3d704fde4b284de382e02 Mon Sep 17 00:00:00 2001
From: Mike Griese <migrie@microsoft.com>
Date: Thu, 10 Feb 2022 12:31:14 -0600
Subject: [PATCH 3/3] more comments

---
 src/cascadia/TerminalApp/App.xaml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/cascadia/TerminalApp/App.xaml b/src/cascadia/TerminalApp/App.xaml
index bfdd08b1ab1..07c70c6b72f 100644
--- a/src/cascadia/TerminalApp/App.xaml
+++ b/src/cascadia/TerminalApp/App.xaml
@@ -54,15 +54,21 @@
                     <ResourceDictionary.ThemeDictionaries>
                         <ResourceDictionary x:Key="Dark">
                             <!--  Define resources for Dark mode here  -->
-                            <!-- <SolidColorBrush x:Key="TabViewBackground"
-                                            Color="{ThemeResource SolidBackgroundFillColorBase}" />-->
-                            <!-- <SolidColorBrush x:Key="TabViewBackground"
-                                            Color="{StaticResource SolidBackgroundFillColorBase}" />-->
+
+                            <!--
+                                This is the color of
+                                ApplicationPageBackgroundThemeBrush, which is
+                                evaluated as SolidBackgroundFillColorBase. If we try
+                                to use those resources directly though, we don't get
+                                the properly themed versions. Presumably because the
+                                App itself can't have it's RequestedTheme changed at
+                                runtime.
+                                
+                                See GH #12356 for more history on the subject.
+                            -->
                             <SolidColorBrush x:Key="TabViewBackground"
                                              Color="#202020" />
 
-
-
                             <StaticResource x:Key="UnfocusedBorderBrush"
                                             ResourceKey="ApplicationPageBackgroundThemeBrush" />
 
@@ -71,17 +77,11 @@
 
                         <ResourceDictionary x:Key="Light">
                             <!--  Define resources for Light mode here  -->
-
-                            <!--  This is the color of ApplicationPageBackgroundThemeBrush, which is evaluated as SolidBackgroundFillColorBase. If we try to use those resources directly though, we don't get the properly themed versions. Presumably because the App itself can't have it's RequestedTheme changed at runtime.  -->
                             <SolidColorBrush x:Key="TabViewBackground"
                                              Color="#F3F3F3" />
 
-
-
                             <StaticResource x:Key="UnfocusedBorderBrush"
                                             ResourceKey="ApplicationPageBackgroundThemeBrush" />
-
-
                         </ResourceDictionary>
 
                     </ResourceDictionary.ThemeDictionaries>