Skip to content

Commit 533e48d

Browse files
carlos-zamoracarlos-zamora
committed
PRE-MERGE #18953 Setting to set pane highlight active, inactive and broadcast color
2 parents cd25b44 + ce1ba03 commit 533e48d

File tree

7 files changed

+132
-36
lines changed

7 files changed

+132
-36
lines changed

‎doc/cascadia/profiles.schema.json‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2000,6 +2000,24 @@
20002000
}
20012001
}
20022002
},
2003+
"PaneTheme": {
2004+
"additionalProperties": false,
2005+
"description": "A set of properties for customizing the appearance of the panes",
2006+
"properties": {
2007+
"activeBorderColor": {
2008+
"description": "The color of the pane border when the pane is active",
2009+
"$ref": "#/$defs/ThemeColor"
2010+
},
2011+
"inactiveBorderColor": {
2012+
"description": "The color of the pane border when the pane is inactive",
2013+
"$ref": "#/$defs/ThemeColor"
2014+
},
2015+
"broadcastBorderColor": {
2016+
"description": "The color of the pane border when broadcasted",
2017+
"$ref": "#/$defs/ThemeColor"
2018+
}
2019+
}
2020+
},
20032021
"WindowTheme": {
20042022
"additionalProperties": false,
20052023
"description": "A set of properties for customizing the appearance of the window itself",
@@ -2056,6 +2074,9 @@
20562074
},
20572075
"window": {
20582076
"$ref": "#/$defs/WindowTheme"
2077+
},
2078+
"pane": {
2079+
"$ref": "#/$defs/PaneTheme"
20592080
}
20602081
}
20612082
},

‎src/cascadia/TerminalApp/TerminalPage.cpp‎

Lines changed: 76 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4695,10 +4695,13 @@ namespace winrt::TerminalApp::implementation
46954695
}
46964696

46974697
const auto theme = _settings.GlobalSettings().CurrentTheme();
4698-
auto requestedTheme{ theme.RequestedTheme() };
4698+
const auto paneActiveBorderColor = theme.Pane() ? theme.Pane().ActiveBorderColor() : nullptr;
4699+
const auto paneInactiveBorderColor = theme.Pane() ? theme.Pane().InactiveBorderColor() : nullptr;
4700+
const auto broadcastBorderColor = theme.Pane() ? theme.Pane().BroadcastBorderColor() : nullptr;
4701+
const auto requestedTheme{ theme.RequestedTheme() };
46994702

47004703
{
4701-
_updatePaneResources(requestedTheme);
4704+
_updatePaneResources(requestedTheme, paneActiveBorderColor, paneInactiveBorderColor, broadcastBorderColor);
47024705

47034706
for (const auto& tab : _tabs)
47044707
{
@@ -4802,67 +4805,106 @@ namespace winrt::TerminalApp::implementation
48024805
}
48034806
}
48044807

4808+
4809+
Color TerminalPage::_colorFromKey(const ResourceDictionary& resourceDictionary, const ElementTheme& requestedTheme, const IInspectable& colorKey)
4810+
{
4811+
const auto colorFromResources = ThemeLookup(resourceDictionary, requestedTheme, colorKey);
4812+
// If SystemAccentColor is _not_ a Color for some reason, use
4813+
// Transparent as the color, so we don't do this process again on
4814+
// the next pane (by leaving s_focusedBorderBrush nullptr)
4815+
return winrt::unbox_value_or<Color>(colorFromResources, Colors::Black());
4816+
}
4817+
4818+
Color TerminalPage::_parseThemeColorToColor(
4819+
const ThemeColor& colorToCopy,
4820+
const ResourceDictionary& resourceDictionary,
4821+
const ElementTheme& requestedTheme,
4822+
const IInspectable& colorKey
4823+
)
4824+
{
4825+
switch (colorToCopy.ColorType())
4826+
{
4827+
case ThemeColorType::Accent:
4828+
return _colorFromKey(resourceDictionary, requestedTheme, colorKey);
4829+
case ThemeColorType::Color:
4830+
const auto rawColor = colorToCopy.Color();
4831+
return Color{
4832+
rawColor.A,
4833+
rawColor.R,
4834+
rawColor.G,
4835+
rawColor.B
4836+
};
4837+
case ThemeColorType::TerminalBackground:
4838+
const auto terminalBg = ThemeColor::FromTerminalBackground().Color();
4839+
return Color{
4840+
terminalBg.A,
4841+
terminalBg.R,
4842+
terminalBg.G,
4843+
terminalBg.B
4844+
};
4845+
default:
4846+
assert(false && "unknown type for color type in theme color"); // should never be reached
4847+
return winrt::Windows::UI::Color{};
4848+
}
4849+
}
4850+
48054851
// Function Description:
48064852
// - Attempts to load some XAML resources that Panes will need. This includes:
48074853
// * The Color they'll use for active Panes's borders - SystemAccentColor
48084854
// * The Brush they'll use for inactive Panes - TabViewBackground (to match the
48094855
// color of the titlebar)
48104856
// Arguments:
48114857
// - requestedTheme: this should be the currently active Theme for the app
4858+
// - activeBorderColor: the pane's border color for the application when it is active
4859+
// - inactiveBorderColor: the pane's border color for the application when it is inactive
4860+
// - broadcastBorderColor: the pane's border color for the application when it is broadcast
48124861
// Return Value:
48134862
// - <none>
4814-
void TerminalPage::_updatePaneResources(const winrt::Windows::UI::Xaml::ElementTheme& requestedTheme)
4863+
void TerminalPage::_updatePaneResources(const ElementTheme& requestedTheme, const ThemeColor& activeBorderColor, const ThemeColor& inactiveBorderColor, const ThemeColor& broadcastBorderColor)
48154864
{
48164865
const auto res = Application::Current().Resources();
48174866
const auto accentColorKey = winrt::box_value(L"SystemAccentColor");
4867+
auto activeBrushColor = Colors::Black(), inactiveBrushColor = Colors::Black(), broadcastBrushColor = Colors::Black();
48184868
if (res.HasKey(accentColorKey))
48194869
{
4820-
const auto colorFromResources = ThemeLookup(res, requestedTheme, accentColorKey);
4821-
// If SystemAccentColor is _not_ a Color for some reason, use
4822-
// Transparent as the color, so we don't do this process again on
4823-
// the next pane (by leaving s_focusedBorderBrush nullptr)
4824-
auto actualColor = winrt::unbox_value_or<Color>(colorFromResources, Colors::Black());
4825-
_paneResources.focusedBorderBrush = SolidColorBrush(actualColor);
4870+
activeBrushColor = _colorFromKey(res, requestedTheme, accentColorKey);
48264871
}
4827-
else
4872+
// Overwrites the accent above (or the black default color if there was no accent color)
4873+
if (activeBorderColor)
48284874
{
4829-
// DON'T use Transparent here - if it's "Transparent", then it won't
4830-
// be able to hittest for clicks, and then clicking on the border
4831-
// will eat focus.
4832-
_paneResources.focusedBorderBrush = SolidColorBrush{ Colors::Black() };
4875+
activeBrushColor = _parseThemeColorToColor(activeBorderColor, res, requestedTheme, accentColorKey);
48334876
}
4834-
4877+
// DON'T use Transparent here - if it's "Transparent", then it won't
4878+
// be able to hittest for clicks, and then clicking on the border
4879+
// will eat focus.
4880+
_paneResources.focusedBorderBrush = SolidColorBrush(activeBrushColor);
48354881
const auto unfocusedBorderBrushKey = winrt::box_value(L"UnfocusedBorderBrush");
48364882
if (res.HasKey(unfocusedBorderBrushKey))
48374883
{
4838-
// MAKE SURE TO USE ThemeLookup, so that we get the correct resource for
4839-
// the requestedTheme, not just the value from the resources (which
4840-
// might not respect the settings' requested theme)
4841-
auto obj = ThemeLookup(res, requestedTheme, unfocusedBorderBrushKey);
4842-
_paneResources.unfocusedBorderBrush = obj.try_as<winrt::Windows::UI::Xaml::Media::SolidColorBrush>();
4884+
inactiveBrushColor = _colorFromKey(res, requestedTheme, unfocusedBorderBrushKey);
48434885
}
4844-
else
4886+
// Overwrites the above (or the black default color if there was no unfocusedBorderBrushKey)
4887+
if (inactiveBorderColor)
48454888
{
4846-
// DON'T use Transparent here - if it's "Transparent", then it won't
4847-
// be able to hittest for clicks, and then clicking on the border
4848-
// will eat focus.
4849-
_paneResources.unfocusedBorderBrush = SolidColorBrush{ Colors::Black() };
4889+
inactiveBrushColor = _parseThemeColorToColor(inactiveBorderColor, res, requestedTheme, unfocusedBorderBrushKey);
48504890
}
4851-
4891+
// DON'T use Transparent here - if it's "Transparent", then it won't
4892+
// be able to hittest for clicks, and then clicking on the border
4893+
// will eat focus.
4894+
_paneResources.unfocusedBorderBrush = SolidColorBrush(inactiveBrushColor);
48524895
const auto broadcastColorKey = winrt::box_value(L"BroadcastPaneBorderColor");
48534896
if (res.HasKey(broadcastColorKey))
48544897
{
4855-
// MAKE SURE TO USE ThemeLookup
4856-
auto obj = ThemeLookup(res, requestedTheme, broadcastColorKey);
4857-
_paneResources.broadcastBorderBrush = obj.try_as<winrt::Windows::UI::Xaml::Media::SolidColorBrush>();
4898+
_colorFromKey(res, requestedTheme, broadcastColorKey);
48584899
}
4859-
else
4900+
if (broadcastBorderColor)
48604901
{
4861-
// DON'T use Transparent here - if it's "Transparent", then it won't
4862-
// be able to hittest for clicks, and then clicking on the border
4863-
// will eat focus.
4864-
_paneResources.broadcastBorderBrush = SolidColorBrush{ Colors::Black() };
4902+
broadcastBrushColor = _parseThemeColorToColor(broadcastBorderColor, res, requestedTheme, broadcastColorKey);
48654903
}
4904+
// DON'T use Transparent here - if it's "Transparent", then it won't
4905+
// be able to hittest for clicks, and then clicking on the border
4906+
// will eat focus.
4907+
_paneResources.broadcastBorderBrush = SolidColorBrush(broadcastBrushColor);
48664908
}
48674909

48684910
void TerminalPage::WindowActivated(const bool activated)

‎src/cascadia/TerminalApp/TerminalPage.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,9 @@ namespace winrt::TerminalApp::implementation
521521

522522
void _updateThemeColors();
523523
void _updateAllTabCloseButtons();
524-
void _updatePaneResources(const winrt::Windows::UI::Xaml::ElementTheme& requestedTheme);
524+
winrt::Windows::UI::Color _colorFromKey(const winrt::Windows::UI::Xaml::ResourceDictionary& resourceDictionary, const winrt::Windows::UI::Xaml::ElementTheme& requestedTheme, const winrt::Windows::Foundation::IInspectable& colorKey);
525+
winrt::Windows::UI::Color _parseThemeColorToColor(const winrt::Microsoft::Terminal::Settings::Model::ThemeColor& colorToCopy, const winrt::Windows::UI::Xaml::ResourceDictionary& resourceDictionary, const winrt::Windows::UI::Xaml::ElementTheme& requestedTheme, const winrt::Windows::Foundation::IInspectable& colorKey);
526+
void _updatePaneResources(const winrt::Windows::UI::Xaml::ElementTheme& requestedTheme, const winrt::Microsoft::Terminal::Settings::Model::ThemeColor& activeBorderColor, const winrt::Microsoft::Terminal::Settings::Model::ThemeColor& inactiveBorderColor, const winrt::Microsoft::Terminal::Settings::Model::ThemeColor& broadcastBorderColor);
525527

526528
safe_void_coroutine _ControlCompletionsChangedHandler(const winrt::Windows::Foundation::IInspectable sender, const winrt::Microsoft::Terminal::Control::CompletionsChangedEventArgs args);
527529

‎src/cascadia/TerminalSettingsModel/MTSMSettings.h‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,8 @@ Author(s):
147147
X(winrt::Microsoft::Terminal::Settings::Model::WindowTheme, Window, "window", nullptr) \
148148
X(winrt::Microsoft::Terminal::Settings::Model::SettingsTheme, Settings, "settings", nullptr) \
149149
X(winrt::Microsoft::Terminal::Settings::Model::TabRowTheme, TabRow, "tabRow", nullptr) \
150-
X(winrt::Microsoft::Terminal::Settings::Model::TabTheme, Tab, "tab", nullptr)
150+
X(winrt::Microsoft::Terminal::Settings::Model::TabTheme, Tab, "tab", nullptr) \
151+
X(winrt::Microsoft::Terminal::Settings::Model::PaneTheme, Pane, "pane", nullptr)
151152

152153
#define MTSM_THEME_WINDOW_SETTINGS(X) \
153154
X(winrt::Windows::UI::Xaml::ElementTheme, RequestedTheme, "applicationTheme", winrt::Windows::UI::Xaml::ElementTheme::Default) \
@@ -163,6 +164,11 @@ Author(s):
163164
X(winrt::Microsoft::Terminal::Settings::Model::ThemeColor, Background, "background", nullptr) \
164165
X(winrt::Microsoft::Terminal::Settings::Model::ThemeColor, UnfocusedBackground, "unfocusedBackground", nullptr)
165166

167+
#define MTSM_THEME_PANE_SETTINGS(X) \
168+
X(winrt::Microsoft::Terminal::Settings::Model::ThemeColor, ActiveBorderColor, "activeBorderColor", nullptr) \
169+
X(winrt::Microsoft::Terminal::Settings::Model::ThemeColor, InactiveBorderColor, "inactiveBorderColor", nullptr) \
170+
X(winrt::Microsoft::Terminal::Settings::Model::ThemeColor, BroadcastBorderColor, "broadcastBorderColor", nullptr)
171+
166172
#define MTSM_THEME_TAB_SETTINGS(X) \
167173
X(winrt::Microsoft::Terminal::Settings::Model::ThemeColor, Background, "background", nullptr) \
168174
X(winrt::Microsoft::Terminal::Settings::Model::ThemeColor, UnfocusedBackground, "unfocusedBackground", nullptr) \

‎src/cascadia/TerminalSettingsModel/Theme.cpp‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include "SettingsTheme.g.h"
1313
#include "ThemeColor.g.cpp"
1414
#include "WindowTheme.g.cpp"
15+
#include "PaneTheme.g.cpp"
1516
#include "TabRowTheme.g.cpp"
1617
#include "TabTheme.g.cpp"
1718
#include "ThemePair.g.cpp"
@@ -60,6 +61,7 @@ THEME_OBJECT(WindowTheme, MTSM_THEME_WINDOW_SETTINGS);
6061
THEME_OBJECT(SettingsTheme, MTSM_THEME_SETTINGS_SETTINGS);
6162
THEME_OBJECT(TabRowTheme, MTSM_THEME_TABROW_SETTINGS);
6263
THEME_OBJECT(TabTheme, MTSM_THEME_TAB_SETTINGS);
64+
THEME_OBJECT(PaneTheme, MTSM_THEME_PANE_SETTINGS);
6365

6466
#undef THEME_SETTINGS_COPY
6567
#undef THEME_SETTINGS_TO_JSON
@@ -224,6 +226,7 @@ THEME_OBJECT_CONVERTER(winrt::Microsoft::Terminal::Settings::Model, WindowTheme,
224226
THEME_OBJECT_CONVERTER(winrt::Microsoft::Terminal::Settings::Model, SettingsTheme, MTSM_THEME_SETTINGS_SETTINGS);
225227
THEME_OBJECT_CONVERTER(winrt::Microsoft::Terminal::Settings::Model, TabRowTheme, MTSM_THEME_TABROW_SETTINGS);
226228
THEME_OBJECT_CONVERTER(winrt::Microsoft::Terminal::Settings::Model, TabTheme, MTSM_THEME_TAB_SETTINGS);
229+
THEME_OBJECT_CONVERTER(winrt::Microsoft::Terminal::Settings::Model, PaneTheme, MTSM_THEME_PANE_SETTINGS);
227230

228231
#undef THEME_SETTINGS_FROM_JSON
229232
#undef THEME_SETTINGS_TO_JSON
@@ -254,6 +257,10 @@ winrt::com_ptr<Theme> Theme::Copy() const
254257
{
255258
theme->_Tab = *winrt::get_self<implementation::TabTheme>(_Tab)->Copy();
256259
}
260+
if (_Pane)
261+
{
262+
theme->_Pane = *winrt::get_self<implementation::PaneTheme>(_Pane)->Copy();
263+
}
257264
if (_Settings)
258265
{
259266
theme->_Settings = *winrt::get_self<implementation::SettingsTheme>(_Settings)->Copy();
@@ -334,6 +341,13 @@ void Theme::LogSettingChanges(std::set<std::string>& changes, const std::string_
334341
const auto outerJsonKey = outerTabJsonKey;
335342
MTSM_THEME_TAB_SETTINGS(LOG_IF_SET)
336343
}
344+
345+
if (isPaneSet)
346+
{
347+
const auto obj = _Pane;
348+
const auto outerJsonKey = outerPaneJsonKey;
349+
MTSM_THEME_PANE_SETTINGS(LOG_IF_SET);
350+
}
337351
#undef LOG_IF_SET
338352
#undef GENERATE_SET_CHECK_AND_JSON_KEYS
339353
#pragma warning(pop)

‎src/cascadia/TerminalSettingsModel/Theme.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Author(s):
2323
#include "WindowTheme.g.h"
2424
#include "TabRowTheme.g.h"
2525
#include "TabTheme.g.h"
26+
#include "PaneTheme.g.h"
2627
#include "ThemePair.g.h"
2728
#include "Theme.g.h"
2829

@@ -85,6 +86,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
8586
THEME_OBJECT(SettingsTheme, MTSM_THEME_SETTINGS_SETTINGS);
8687
THEME_OBJECT(TabRowTheme, MTSM_THEME_TABROW_SETTINGS);
8788
THEME_OBJECT(TabTheme, MTSM_THEME_TAB_SETTINGS);
89+
THEME_OBJECT(PaneTheme, MTSM_THEME_PANE_SETTINGS);
8890

8991
struct Theme : ThemeT<Theme>
9092
{

‎src/cascadia/TerminalSettingsModel/Theme.idl‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,12 @@ namespace Microsoft.Terminal.Settings.Model
7171
ThemeColor UnfocusedBackground { get; };
7272
}
7373

74+
runtimeclass PaneTheme {
75+
ThemeColor ActiveBorderColor { get; };
76+
ThemeColor InactiveBorderColor { get; };
77+
ThemeColor BroadcastBorderColor { get; };
78+
}
79+
7480
runtimeclass TabTheme {
7581
ThemeColor Background { get; };
7682
ThemeColor UnfocusedBackground { get; };
@@ -93,6 +99,9 @@ namespace Microsoft.Terminal.Settings.Model
9399
// tabRow.* Namespace
94100
TabRowTheme TabRow { get; };
95101

102+
// pane.* Namespace
103+
PaneTheme Pane { get; };
104+
96105
// tab.* Namespace
97106
TabTheme Tab { get; };
98107

0 commit comments

Comments
 (0)