Skip to content

Commit

Permalink
Don't set the new tab button colors for now (microsoft#5749)
Browse files Browse the repository at this point in the history
This is actually related to another issue we have, microsoft#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 microsoft#3789 
* related to microsoft#3917

## PR Checklist
* [x] Closes microsoft#5741
  • Loading branch information
zadjii-msft authored and jelster committed May 28, 2020
1 parent 09b8be3 commit 0a4e448
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion src/cascadia/TerminalApp/TerminalPage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 0a4e448

Please sign in to comment.