Add support for tab.background to themes

.github/actions/spelling/allow/apis.txt

@@ -30,6 +30,11 @@ DERR
 dlldata
 DONTADDTORECENT
 DWORDLONG
+<<<<<<< HEAD
+DWMSBT
+DWMWA
+=======
+>>>>>>> origin/main
 endfor
 enumset
 environstrings
@@ -95,6 +100,7 @@ lround
 Lsa
 lsass
 LSHIFT
+MAINWINDOW
 memchr
 memicmp
 MENUCOMMAND
@@ -175,6 +181,8 @@ Stubless
 Subheader
 Subpage
 syscall
+SYSTEMBACKDROP
+TABROW
 TASKBARCREATED
 TBPF
 THEMECHANGED

src/cascadia/LocalTests_SettingsModel/SettingsModel.LocalTests.vcxproj

@@ -41,6 +41,7 @@
     <ClCompile Include="DeserializationTests.cpp" />
     <ClCompile Include="SerializationTests.cpp" />
     <ClCompile Include="TerminalSettingsTests.cpp" />
+    <ClCompile Include="ThemeTests.cpp" />
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>

src/cascadia/LocalTests_SettingsModel/ThemeTests.cpp

@@ -0,0 +1,280 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "pch.h"
+
+#include "../TerminalSettingsModel/Theme.h"
+#include "../TerminalSettingsModel/CascadiaSettings.h"
+#include "../types/inc/colorTable.hpp"
+#include "JsonTestClass.h"
+
+#include <defaults.h>
+
+using namespace Microsoft::Console;
+using namespace winrt::Microsoft::Terminal;
+using namespace winrt::Microsoft::Terminal::Settings::Model::implementation;
+using namespace WEX::Logging;
+using namespace WEX::TestExecution;
+using namespace WEX::Common;
+
+namespace SettingsModelLocalTests
+{
+    // TODO:microsoft/terminal#3838:
+    // Unfortunately, these tests _WILL NOT_ work in our CI. We're waiting for
+    // an updated TAEF that will let us install framework packages when the test
+    // package is deployed. Until then, these tests won't deploy in CI.
+
+    class ThemeTests : public JsonTestClass
+    {
+        // Use a custom AppxManifest to ensure that we can activate winrt types
+        // from our test. This property will tell taef to manually use this as
+        // the AppxManifest for this test class.
+        // This does not yet work for anything XAML-y. See TabTests.cpp for more
+        // details on that.
+        BEGIN_TEST_CLASS(ThemeTests)
+            TEST_CLASS_PROPERTY(L"RunAs", L"UAP")
+            TEST_CLASS_PROPERTY(L"UAP:AppXManifest", L"TestHostAppXManifest.xml")
+        END_TEST_CLASS()
+
+        TEST_METHOD(ParseSimpleTheme);
+        TEST_METHOD(ParseEmptyTheme);
+        TEST_METHOD(ParseNoWindowTheme);
+        TEST_METHOD(ParseNullWindowTheme);
+        TEST_METHOD(ParseThemeWithNullThemeColor);
+        TEST_METHOD(InvalidCurrentTheme);
+
+        static Core::Color rgb(uint8_t r, uint8_t g, uint8_t b) noexcept
+        {
+            return Core::Color{ r, g, b, 255 };
+        }
+    };
+
+    void ThemeTests::ParseSimpleTheme()
+    {
+        static constexpr std::string_view orangeTheme{ R"({
+            "name": "orange",
+            "tabRow":
+            {
+                "background": "#FFFF8800",
+                "unfocusedBackground": "#FF884400"
+            },
+            "window":
+            {
+                "applicationTheme": "light",
+                "useMica": true
+            }
+        })" };
+
+        const auto schemeObject = VerifyParseSucceeded(orangeTheme);
+        auto theme = Theme::FromJson(schemeObject);
+        VERIFY_ARE_EQUAL(L"orange", theme->Name());
+
+        VERIFY_IS_NOT_NULL(theme->TabRow());
+        VERIFY_IS_NOT_NULL(theme->TabRow().Background());
+        VERIFY_ARE_EQUAL(Settings::Model::ThemeColorType::Color, theme->TabRow().Background().ColorType());
+        VERIFY_ARE_EQUAL(rgb(0xff, 0x88, 0x00), theme->TabRow().Background().Color());
+
+        VERIFY_IS_NOT_NULL(theme->Window());
+        VERIFY_ARE_EQUAL(winrt::Windows::UI::Xaml::ElementTheme::Light, theme->Window().RequestedTheme());
+        VERIFY_ARE_EQUAL(true, theme->Window().UseMica());
+    }
+
+    void ThemeTests::ParseEmptyTheme()
+    {
+        Log::Comment(L"This theme doesn't have any elements defined.");
+        static constexpr std::string_view emptyTheme{ R"({
+            "name": "empty"
+        })" };
+
+        const auto schemeObject = VerifyParseSucceeded(emptyTheme);
+        auto theme = Theme::FromJson(schemeObject);
+        VERIFY_ARE_EQUAL(L"empty", theme->Name());
+        VERIFY_IS_NULL(theme->TabRow());
+        VERIFY_IS_NULL(theme->Window());
+        VERIFY_ARE_EQUAL(winrt::Windows::UI::Xaml::ElementTheme::Default, theme->RequestedTheme());
+    }
+
+    void ThemeTests::ParseNoWindowTheme()
+    {
+        Log::Comment(L"This theme doesn't have a window defined.");
+        static constexpr std::string_view emptyTheme{ R"({
+            "name": "noWindow",
+            "tabRow":
+            {
+                "background": "#FF112233",
+                "unfocusedBackground": "#FF884400"
+            },
+        })" };
+
+        const auto schemeObject = VerifyParseSucceeded(emptyTheme);
+        auto theme = Theme::FromJson(schemeObject);
+        VERIFY_ARE_EQUAL(L"noWindow", theme->Name());
+
+        VERIFY_IS_NOT_NULL(theme->TabRow());
+        VERIFY_IS_NOT_NULL(theme->TabRow().Background());
+        VERIFY_ARE_EQUAL(Settings::Model::ThemeColorType::Color, theme->TabRow().Background().ColorType());
+        VERIFY_ARE_EQUAL(rgb(0x11, 0x22, 0x33), theme->TabRow().Background().Color());
+
+        VERIFY_IS_NULL(theme->Window());
+        VERIFY_ARE_EQUAL(winrt::Windows::UI::Xaml::ElementTheme::Default, theme->RequestedTheme());
+    }
+
+    void ThemeTests::ParseNullWindowTheme()
+    {
+        Log::Comment(L"This theme doesn't have a window defined.");
+        static constexpr std::string_view emptyTheme{ R"({
+            "name": "nullWindow",
+            "tabRow":
+            {
+                "background": "#FF112233",
+                "unfocusedBackground": "#FF884400"
+            },
+            "window": null
+        })" };
+
+        const auto schemeObject = VerifyParseSucceeded(emptyTheme);
+        auto theme = Theme::FromJson(schemeObject);
+        VERIFY_ARE_EQUAL(L"nullWindow", theme->Name());
+
+        VERIFY_IS_NOT_NULL(theme->TabRow());
+        VERIFY_IS_NOT_NULL(theme->TabRow().Background());
+        VERIFY_ARE_EQUAL(Settings::Model::ThemeColorType::Color, theme->TabRow().Background().ColorType());
+        VERIFY_ARE_EQUAL(rgb(0x11, 0x22, 0x33), theme->TabRow().Background().Color());
+
+        VERIFY_IS_NULL(theme->Window());
+        VERIFY_ARE_EQUAL(winrt::Windows::UI::Xaml::ElementTheme::Default, theme->RequestedTheme());
+    }
+
+    void ThemeTests::ParseThemeWithNullThemeColor()
+    {
+        Log::Comment(L"These themes are all missing a tabRow background. Make sure we don't somehow default-construct one for them");
+
+        static constexpr std::string_view settingsString{ R"json({
+            "themes": [
+                {
+                    "name": "backgroundEmpty",
+                    "tabRow":
+                    {
+                    },
+                    "window":
+                    {
+                        "applicationTheme": "light",
+                        "useMica": true
+                    }
+                },
+                {
+                    "name": "backgroundNull",
+                    "tabRow":
+                    {
+                        "background": null
+                    },
+                    "window":
+                    {
+                        "applicationTheme": "light",
+                        "useMica": true
+                    }
+                },
+                {
+                    "name": "backgroundOmittedEntirely",
+                    "window":
+                    {
+                        "applicationTheme": "light",
+                        "useMica": true
+                    }
+                }
+            ]
+        })json" };
+
+        try
+        {
+            const auto settings{ winrt::make_self<CascadiaSettings>(settingsString, DefaultJson) };
+
+            const auto& themes{ settings->GlobalSettings().Themes() };
+            {
+                const auto& backgroundEmpty{ themes.Lookup(L"backgroundEmpty") };
+                VERIFY_ARE_EQUAL(L"backgroundEmpty", backgroundEmpty.Name());
+                VERIFY_IS_NOT_NULL(backgroundEmpty.TabRow());
+                VERIFY_IS_NULL(backgroundEmpty.TabRow().Background());
+            }
+            {
+                const auto& backgroundNull{ themes.Lookup(L"backgroundNull") };
+                VERIFY_ARE_EQUAL(L"backgroundNull", backgroundNull.Name());
+                VERIFY_IS_NOT_NULL(backgroundNull.TabRow());
+                VERIFY_IS_NULL(backgroundNull.TabRow().Background());
+            }
+            {
+                const auto& backgroundOmittedEntirely{ themes.Lookup(L"backgroundOmittedEntirely") };
+                VERIFY_ARE_EQUAL(L"backgroundOmittedEntirely", backgroundOmittedEntirely.Name());
+                VERIFY_IS_NULL(backgroundOmittedEntirely.TabRow());
+            }
+        }
+        catch (const SettingsException& ex)
+        {
+            auto loadError = ex.Error();
+            loadError;
+            DebugBreak();
+            throw ex;
+        }
+        catch (const SettingsTypedDeserializationException& e)
+        {
+            auto deserializationErrorMessage = til::u8u16(e.what());
+            Log::Comment(NoThrowString().Format(deserializationErrorMessage.c_str()));
+            DebugBreak();
+            throw e;
+        }
+    }
+
+    void ThemeTests::InvalidCurrentTheme()
+    {
+        Log::Comment(L"Make sure specifying an invalid theme falls back to a sensible default.");
+
+        static constexpr std::string_view settingsString{ R"json({
+            "theme": "foo",
+            "themes": [
+                {
+                    "name": "bar",
+                    "tabRow": {},
+                    "window":
+                    {
+                        "applicationTheme": "light",
+                        "useMica": true
+                    }
+                }
+            ]
+        })json" };
+
+        try
+        {
+            const auto settings{ winrt::make_self<CascadiaSettings>(settingsString, DefaultJson) };
+
+            VERIFY_ARE_EQUAL(1u, settings->Warnings().Size());
+            VERIFY_ARE_EQUAL(Settings::Model::SettingsLoadWarnings::UnknownTheme, settings->Warnings().GetAt(0));
+
+            const auto& themes{ settings->GlobalSettings().Themes() };
+            {
+                const auto& bar{ themes.Lookup(L"bar") };
+                VERIFY_ARE_EQUAL(L"bar", bar.Name());
+                VERIFY_IS_NOT_NULL(bar.TabRow());
+                VERIFY_IS_NULL(bar.TabRow().Background());
+            }
+
+            const auto currentTheme{ settings->GlobalSettings().CurrentTheme() };
+            VERIFY_IS_NOT_NULL(currentTheme);
+            VERIFY_ARE_EQUAL(L"system", currentTheme.Name());
+        }
+        catch (const SettingsException& ex)
+        {
+            auto loadError = ex.Error();
+            loadError;
+            DebugBreak();
+            throw ex;
+        }
+        catch (const SettingsTypedDeserializationException& e)
+        {
+            auto deserializationErrorMessage = til::u8u16(e.what());
+            Log::Comment(NoThrowString().Format(deserializationErrorMessage.c_str()));
+            DebugBreak();
+            throw e;
+        }
+    }
+}

src/cascadia/TerminalApp/AppLogic.cpp

@@ -51,6 +51,7 @@ static const std::array settingsLoadWarningsLabels {
     USES_RESOURCE(L"InvalidSplitSize"),
     USES_RESOURCE(L"FailedToParseStartupActions"),
     USES_RESOURCE(L"FailedToParseSubCommands"),
+    USES_RESOURCE(L"UnknownTheme"),
 };
 static const std::array settingsLoadErrorsLabels {
     USES_RESOURCE(L"NoProfilesText"),
@@ -367,11 +368,12 @@ namespace winrt::TerminalApp::implementation
         // details here, but it does have the desired effect.
         // It's not enough to set the theme on the dialog alone.
         auto themingLambda{ [this](const Windows::Foundation::IInspectable& sender, const RoutedEventArgs&) {
-            auto theme{ _settings.GlobalSettings().Theme() };
+            auto theme{ _settings.GlobalSettings().CurrentTheme() };
+            auto requestedTheme{ theme.RequestedTheme() };
             auto element{ sender.try_as<winrt::Windows::UI::Xaml::FrameworkElement>() };
             while (element)
             {
-                element.RequestedTheme(theme);
+                element.RequestedTheme(requestedTheme);
                 element = element.Parent().try_as<winrt::Windows::UI::Xaml::FrameworkElement>();
             }
         } };
@@ -743,7 +745,7 @@ namespace winrt::TerminalApp::implementation
             LoadSettings();
         }
 
-        return _settings.GlobalSettings().Theme();
+        return _settings.GlobalSettings().CurrentTheme().RequestedTheme();
     }
 
     bool AppLogic::GetShowTabsInTitlebar()
@@ -964,7 +966,7 @@ namespace winrt::TerminalApp::implementation
 
     void AppLogic::_RefreshThemeRoutine()
     {
-        _ApplyTheme(_settings.GlobalSettings().Theme());
+        _ApplyTheme(_settings.GlobalSettings().CurrentTheme().RequestedTheme());
     }
 
     // Function Description:
@@ -1219,6 +1221,19 @@ namespace winrt::TerminalApp::implementation
         return {};
     }
 
+    winrt::Windows::UI::Xaml::Media::Brush AppLogic::TitlebarBrush()
+    {
+        if (_root)
+        {
+            return _root->TitlebarBrush();
+        }
+        return { nullptr };
+    }
+    void AppLogic::WindowActivated(const bool activated)
+    {
+        _root->WindowActivated(activated);
+    }
+
     bool AppLogic::HasCommandlineArguments() const noexcept
     {
         return _hasCommandLineArguments;
@@ -1645,4 +1660,15 @@ namespace winrt::TerminalApp::implementation
     {
         return _settings.GlobalSettings().ShowTitleInTitlebar();
     }
+
+    Microsoft::Terminal::Settings::Model::Theme AppLogic::Theme()
+    {
+        if (!_loadedInitialSettings)
+        {
+            // Load settings if we haven't already
+            LoadSettings();
+        }
+        return _settings.GlobalSettings().CurrentTheme();
+    }
+
 }