PRE-MERGE #14644 Use ThemeLookup for the SUI bg too

microsoft · Jan 14, 2023 · 07146b9 · 07146b9
2 parents 94368e2 + d6495d8
commit 07146b9
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
@@ -17,6 +17,7 @@
 #include "InteractionViewModel.h"
 #include "LaunchViewModel.h"
 #include "..\types\inc\utils.hpp"
+#include <..\WinRTUtils\inc\Utils.h>
 
 #include <LibraryResources.h>
 
@@ -679,12 +680,17 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     {
         const auto& theme = _settingsSource.GlobalSettings().CurrentTheme();
+        const auto& requestedTheme = _settingsSource.GlobalSettings().CurrentTheme().RequestedTheme();
+
+        RequestedTheme(requestedTheme);
 
         const auto bgKey = (theme.Window() != nullptr && theme.Window().UseMica()) ?
                                L"SettingsPageMicaBackground" :
                                L"SettingsPageBackground";
 
-        if (const auto bgColor = Resources().TryLookup(winrt::box_value(bgKey)))
+        // remember to use ThemeLookup to get the actual correct color for the
+        // currently requested theme.
+        if (const auto bgColor = ThemeLookup(Resources(), requestedTheme, winrt::box_value(bgKey)))
         {
             SettingsNav().Background(winrt::WUX::Media::SolidColorBrush(winrt::unbox_value<Windows::UI::Color>(bgColor)));
         }