Add support for tab.background to themes

src/cascadia/TerminalApp/TabManagement.cpp

@@ -154,7 +154,7 @@ namespace winrt::TerminalApp::implementation
                 // Possibly update the icon of the tab.
                 page->_UpdateTabIcon(*tab);
 
-                page->_updateTabRowColors();
+                page->_updateThemeColors();
 
                 // Update the taskbar progress as well. We'll raise our own
                 // SetTaskbarProgress event here, to get tell the hosting
@@ -927,7 +927,7 @@ namespace winrt::TerminalApp::implementation
                 _TitleChangedHandlers(*this, tab.Title());
             }
 
-            _updateTabRowColors();
+            _updateThemeColors();
 
             auto tab_impl = _GetTerminalTabImpl(tab);
             if (tab_impl)

src/cascadia/TerminalApp/TerminalPage.cpp

@@ -223,7 +223,7 @@ namespace winrt::TerminalApp::implementation
             transparent.Color(Windows::UI::Colors::Transparent());
             _tabRow.Background(transparent);
         }
-        _updateTabRowColors();
+        _updateThemeColors();
 
         // Hookup our event handlers to the ShortcutActionDispatch
         _RegisterActionCallbacks();
@@ -1440,7 +1440,7 @@ namespace winrt::TerminalApp::implementation
             {
                 if (e.PropertyName() == L"BackgroundBrush")
                 {
-                    page->_updateTabRowColors();
+                    page->_updateThemeColors();
                 }
             }
         });
@@ -2702,7 +2702,7 @@ namespace winrt::TerminalApp::implementation
 
         ////////////////////////////////////////////////////////////////////////
         // Begin Theme handling
-        _updateTabRowColors();
+        _updateThemeColors();
     }
 
     // This is a helper to aid in sorting commands by their `Name`s, alphabetically.
@@ -4004,15 +4004,27 @@ namespace winrt::TerminalApp::implementation
         applicationState.DismissedMessages(std::move(messages));
     }
 
-    void TerminalPage::_updateTabRowColors()
+    void TerminalPage::_updateThemeColors()
     {
         if (_settings == nullptr)
         {
             return;
         }
 
         const auto theme = _settings.GlobalSettings().CurrentTheme();
-        const auto requestedTheme{ theme.RequestedTheme() };
+        auto requestedTheme{ theme.RequestedTheme() };
+
+        // First: Update the colors of our individual TabViewItems. This applies tab.background to the tabs via TerminalTab::ThemeColor
+        {
+            auto tabBackground = theme.Tab() ? theme.Tab().Background() : nullptr;
+            for (const auto& tab : _tabs)
+            {
+                if (const auto& terminalTabImpl{ _GetTerminalTabImpl(tab) })
+                {
+                    terminalTabImpl->ThemeColor(tabBackground);
+                }
+            }
+        }
 
         const auto res = Application::Current().Resources();
 
@@ -4130,6 +4142,6 @@ namespace winrt::TerminalApp::implementation
         // Stash if we're activated. Use that when we reload
         // the settings, change active panes, etc.
         _activated = activated;
-        _updateTabRowColors();
+        _updateThemeColors();
     }
 }

src/cascadia/TerminalApp/TerminalPage.h

@@ -446,7 +446,7 @@ namespace winrt::TerminalApp::implementation
         static bool _IsMessageDismissed(const winrt::Microsoft::Terminal::Settings::Model::InfoBarMessage& message);
         static void _DismissMessage(const winrt::Microsoft::Terminal::Settings::Model::InfoBarMessage& message);
 
-        void _updateTabRowColors();
+        void _updateThemeColors();
 
         winrt::fire_and_forget _ShowWindowChangedHandler(const IInspectable sender, const winrt::Microsoft::Terminal::Control::ShowWindowArgs args);
 

src/cascadia/TerminalApp/TerminalTab.cpp

@@ -1343,7 +1343,7 @@ namespace winrt::TerminalApp::implementation
         // -------------------- | --          | --
         // Runtime Color        | _optional_  | Color Picker / `setTabColor` action
         // Control Tab Color    | _optional_  | Profile's `tabColor`, or a color set by VT
-        // Theme Tab Background | _optional_  | `tab.backgroundColor` in the theme
+        // Theme Tab Background | _optional_  | `tab.backgroundColor` in the theme (handled in _RecalculateAndApplyTabColor)
         // Tab Default Color    | **default** | TabView in XAML
         //
         // coalesce will get us the first of these values that's
@@ -1352,7 +1352,6 @@ namespace winrt::TerminalApp::implementation
 
         return til::coalesce(_runtimeTabColor,
                              controlTabColor,
-                             _themeTabColor,
                              std::optional<Windows::UI::Color>(std::nullopt));
     }
 
@@ -1370,6 +1369,12 @@ namespace winrt::TerminalApp::implementation
         _RecalculateAndApplyTabColor();
     }
 
+    void TerminalTab::ThemeColor(const winrt::Microsoft::Terminal::Settings::Model::ThemeColor& color)
+    {
+        _themeColor = color;
+        _RecalculateAndApplyTabColor();
+    }
+
     // Method Description:
     // - This function dispatches a function to the UI thread to recalculate
     //   what this tab's current background color should be. If a color is set,
@@ -1390,11 +1395,37 @@ namespace winrt::TerminalApp::implementation
 
             auto tab{ ptrTab };
 
+            // GetTabColor will return the color set by the color picker, or the
+            // color specified in the profile. If neither of those were set,
+            // then look to _themeColor to see if there's a value there.
+            // Otherwise, clear our color, falling back to the TabView defaults.
             auto currentColor = tab->GetTabColor();
             if (currentColor.has_value())
             {
                 tab->_ApplyTabColor(currentColor.value());
             }
+            else if (tab->_themeColor != nullptr)
+            {
+                // One-liner to safely get the active control's brush.
+                Media::Brush terminalBrush{ nullptr };
+                if (const auto& c{ tab->GetActiveTerminalControl() })
+                {
+                    terminalBrush = c.BackgroundBrush();
+                }
+
+                if (const auto themeBrush{ tab->_themeColor.Evaluate(Application::Current().Resources(), terminalBrush, false) })
+                {
+                    // ThemeColor.Evaluate will get us a Brush (because the
+                    // TermControl could have an acrylic BG, for example). Take
+                    // that brush, and get the color out of it. We don't really
+                    // want to have the tab items themselves be acrylic.
+                    tab->_ApplyTabColor(til::color{ ThemeColor::ColorFromBrush(themeBrush) });
+                }
+                else
+                {
+                    tab->_ClearTabBackgroundColor();
+                }
+            }
             else
             {
                 tab->_ClearTabBackgroundColor();

src/cascadia/TerminalApp/TerminalTab.h

@@ -71,6 +71,7 @@ namespace winrt::TerminalApp::implementation
 
         std::optional<winrt::Windows::UI::Color> GetTabColor();
 
+        void ThemeColor(const winrt::Microsoft::Terminal::Settings::Model::ThemeColor& color);
         void SetRuntimeTabColor(const winrt::Windows::UI::Color& color);
         void ResetRuntimeTabColor();
         void ActivateColorPicker();
@@ -113,10 +114,10 @@ namespace winrt::TerminalApp::implementation
 
         winrt::hstring _lastIconPath{};
         winrt::TerminalApp::ColorPickupFlyout _tabColorPickup{};
-        std::optional<winrt::Windows::UI::Color> _themeTabColor{};
         std::optional<winrt::Windows::UI::Color> _runtimeTabColor{};
         winrt::TerminalApp::TabHeaderControl _headerControl{};
         winrt::TerminalApp::TerminalTabStatus _tabStatus{};
+        winrt::Microsoft::Terminal::Settings::Model::ThemeColor _themeColor{ nullptr };
 
         struct ControlEventTokens
         {

src/cascadia/TerminalSettingsModel/MTSMSettings.h

@@ -117,11 +117,15 @@ Author(s):
 
 #define MTSM_THEME_SETTINGS(X)                                                             \
     X(winrt::Microsoft::Terminal::Settings::Model::WindowTheme, Window, "window", nullptr) \
-    X(winrt::Microsoft::Terminal::Settings::Model::TabRowTheme, TabRow, "tabRow", nullptr)
+    X(winrt::Microsoft::Terminal::Settings::Model::TabRowTheme, TabRow, "tabRow", nullptr) \
+    X(winrt::Microsoft::Terminal::Settings::Model::TabTheme, Tab, "tab", nullptr)
 
 #define MTSM_THEME_WINDOW_SETTINGS(X)                                                                                              \
     X(winrt::Windows::UI::Xaml::ElementTheme, RequestedTheme, "applicationTheme", winrt::Windows::UI::Xaml::ElementTheme::Default) \
     X(bool, UseMica, "useMica", false)
 
 #define MTSM_THEME_TABROW_SETTINGS(X) \
     X(winrt::Microsoft::Terminal::Settings::Model::ThemeColor, Background, "background", nullptr)
+
+#define MTSM_THEME_TAB_SETTINGS(X) \
+    X(winrt::Microsoft::Terminal::Settings::Model::ThemeColor, Background, "background", nullptr)

src/cascadia/TerminalSettingsModel/Theme.cpp

@@ -12,6 +12,7 @@
 #include "ThemeColor.g.cpp"
 #include "WindowTheme.g.cpp"
 #include "TabRowTheme.g.cpp"
+#include "TabTheme.g.cpp"
 #include "Theme.g.cpp"
 
 using namespace ::Microsoft::Console;
@@ -211,6 +212,7 @@ winrt::WUX::Media::Brush ThemeColor::Evaluate(const winrt::WUX::ResourceDictiona
 
 THEME_OBJECT_CONVERTER(winrt::Microsoft::Terminal::Settings::Model, WindowTheme, MTSM_THEME_WINDOW_SETTINGS);
 THEME_OBJECT_CONVERTER(winrt::Microsoft::Terminal::Settings::Model, TabRowTheme, MTSM_THEME_TABROW_SETTINGS);
+THEME_OBJECT_CONVERTER(winrt::Microsoft::Terminal::Settings::Model, TabTheme, MTSM_THEME_TAB_SETTINGS);
 
 #undef THEME_SETTINGS_FROM_JSON
 #undef THEME_SETTINGS_TO_JSON
@@ -242,6 +244,10 @@ winrt::com_ptr<Theme> Theme::Copy() const
     {
         theme->_TabRow = *winrt::get_self<implementation::TabRowTheme>(_TabRow)->Copy();
     }
+    if (_Tab)
+    {
+        theme->_Tab = *winrt::get_self<implementation::TabTheme>(_Tab)->Copy();
+    }
 
     return theme;
 }

src/cascadia/TerminalSettingsModel/Theme.h

@@ -21,6 +21,7 @@ Author(s):
 #include "ThemeColor.g.h"
 #include "WindowTheme.g.h"
 #include "TabRowTheme.g.h"
+#include "TabTheme.g.h"
 #include "Theme.g.h"
 
 namespace winrt::Microsoft::Terminal::Settings::Model::implementation
@@ -57,21 +58,18 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         return result;                        \
     }
 
-    struct WindowTheme : WindowThemeT<WindowTheme>
-    {
-        MTSM_THEME_WINDOW_SETTINGS(THEME_SETTINGS_INITIALIZE);
-
-    public:
-        COPY_THEME_OBJECT(WindowTheme, MTSM_THEME_WINDOW_SETTINGS);
+#define THEME_OBJECT(className, macro)         \
+    struct className : className##T<className> \
+    {                                          \
+        macro(THEME_SETTINGS_INITIALIZE);      \
+                                               \
+    public:                                    \
+        COPY_THEME_OBJECT(className, macro);   \
     };
 
-    struct TabRowTheme : TabRowThemeT<TabRowTheme>
-    {
-        MTSM_THEME_TABROW_SETTINGS(THEME_SETTINGS_INITIALIZE);
-
-    public:
-        COPY_THEME_OBJECT(TabRowTheme, MTSM_THEME_TABROW_SETTINGS);
-    };
+    THEME_OBJECT(WindowTheme, MTSM_THEME_WINDOW_SETTINGS);
+    THEME_OBJECT(TabRowTheme, MTSM_THEME_TABROW_SETTINGS);
+    THEME_OBJECT(TabTheme, MTSM_THEME_TAB_SETTINGS);
 
     struct Theme : ThemeT<Theme>
     {
@@ -98,6 +96,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
 
 #undef THEME_SETTINGS_INITIALIZE
 #undef THEME_SETTINGS_COPY
+#undef THEME_OBJECT
 }
 
 namespace winrt::Microsoft::Terminal::Settings::Model::factory_implementation

src/cascadia/TerminalSettingsModel/Theme.idl

@@ -36,6 +36,10 @@ namespace Microsoft.Terminal.Settings.Model
         ThemeColor Background { get; };
     }
 
+    runtimeclass TabTheme {
+        ThemeColor Background { get; };
+    }
+
     [default_interface] runtimeclass Theme : Windows.Foundation.IStringable {
         Theme();
         Theme(Windows.UI.Xaml.ElementTheme requestedTheme);
@@ -48,6 +52,9 @@ namespace Microsoft.Terminal.Settings.Model
         // tabRow.* Namespace
         TabRowTheme TabRow { get; };
 
+        // tab.* Namespace
+        TabTheme Tab { get; };
+
         // A helper for retrieving the RequestedTheme out of the window property
         Windows.UI.Xaml.ElementTheme RequestedTheme { get; };