From 7a251d85f716f47792a030170b5f97f617f32f86 Mon Sep 17 00:00:00 2001 From: Mike Griese Date: Tue, 5 May 2020 15:33:07 -0500 Subject: [PATCH] Don't set the new tab button colors for now (#5749) This is actually related to another issue we have, #3917. I think if the system is set to "Dark" theme, but the app is set to light theme, then the brush lookup in `_ClearNewTabButtonColor` still returns to us the dark theme brushes. Fortunately, since we're not actually setting the color of the new tab button anymore, we can just remove the call to that method now, and loop back on it later. ## References * regressed in #3789 * related to #3917 ## PR Checklist * [x] Closes #5741 --- src/cascadia/TerminalApp/TerminalPage.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp index 102cf9957d..3d208c7499 100644 --- a/src/cascadia/TerminalApp/TerminalPage.cpp +++ b/src/cascadia/TerminalApp/TerminalPage.cpp @@ -913,8 +913,12 @@ namespace winrt::TerminalApp::implementation } }); + // TODO GH#3327: Once we support colorizing the NewTab button based on + // the color of the tab, we'll want to make sure to call + // _ClearNewTabButtonColor here, to reset it to the default (for the + // newly created tab). // remove any colors left by other colored tabs - _ClearNewTabButtonColor(); + // _ClearNewTabButtonColor(); } // Method Description: @@ -1931,6 +1935,11 @@ namespace winrt::TerminalApp::implementation winrt::Windows::UI::Xaml::Media::SolidColorBrush backgroundBrush; winrt::Windows::UI::Xaml::Media::SolidColorBrush foregroundBrush; + // TODO: Related to GH#3917 - I think if the system is set to "Dark" + // theme, but the app is set to light theme, then this lookup still + // returns to us the dark theme brushes. There's gotta be a way to get + // the right brushes... + // See also GH#5741 if (res.HasKey(defaultBackgroundKey)) { winrt::Windows::Foundation::IInspectable obj = res.Lookup(defaultBackgroundKey);