From d94f4d5a891f276a1eb667bb558be25207152c4a Mon Sep 17 00:00:00 2001 From: Mike Griese Date: Thu, 15 Dec 2022 10:22:29 -0600 Subject: [PATCH 1/4] You're welcome Leonard --- src/cascadia/TerminalSettingsEditor/MainPage.cpp | 13 +++++++++++++ src/cascadia/TerminalSettingsEditor/MainPage.xaml | 6 +++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp index 6f7256597f4..97519b22f04 100644 --- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp +++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp @@ -102,6 +102,19 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation _settingsSource = settings; _settingsClone = settings.Copy(); + { + const auto& theme = _settingsSource.GlobalSettings().CurrentTheme(); + + auto bgKey = (theme.Window() != nullptr && theme.Window().UseMica()) ? + L"SettingsPageMicaBackground" : + L"SettingsPageBackground"; + + if (auto bgColor = Resources().TryLookup(winrt::box_value(bgKey))) + { + SettingsNav().Background(winrt::WUX::Media::SolidColorBrush(winrt::unbox_value(bgColor))); + } + } + // Deduce information about the currently selected item IInspectable lastBreadcrumb; const auto size = _breadcrumbs.Size(); diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.xaml b/src/cascadia/TerminalSettingsEditor/MainPage.xaml index 719d1a6d571..401c684afe9 100644 --- a/src/cascadia/TerminalSettingsEditor/MainPage.xaml +++ b/src/cascadia/TerminalSettingsEditor/MainPage.xaml @@ -31,16 +31,20 @@ #282828 + #00000000 #F9F9F9 + #00000000 + @@ -60,7 +64,7 @@ Date: Thu, 15 Dec 2022 11:00:33 -0600 Subject: [PATCH 2/4] cleanup for review --- .../TerminalSettingsEditor/MainPage.cpp | 32 +++++++++++-------- .../TerminalSettingsEditor/MainPage.h | 2 ++ .../TerminalSettingsEditor/MainPage.xaml | 2 +- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp index 97519b22f04..70acb5c5f57 100644 --- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp +++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp @@ -55,7 +55,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation _settingsClone{ settings.Copy() } { InitializeComponent(); - + _updateBackgroundForMica(); _InitializeProfilesList(); _colorSchemesPageVM = winrt::make(_settingsClone); @@ -102,18 +102,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation _settingsSource = settings; _settingsClone = settings.Copy(); - { - const auto& theme = _settingsSource.GlobalSettings().CurrentTheme(); - - auto bgKey = (theme.Window() != nullptr && theme.Window().UseMica()) ? - L"SettingsPageMicaBackground" : - L"SettingsPageBackground"; - - if (auto bgColor = Resources().TryLookup(winrt::box_value(bgKey))) - { - SettingsNav().Background(winrt::WUX::Media::SolidColorBrush(winrt::unbox_value(bgColor))); - } - } + _updateBackgroundForMica(); // Deduce information about the currently selected item IInspectable lastBreadcrumb; @@ -653,4 +642,21 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation return SettingsNav().Background(); } + // If the theme asks for Mica, then drop out our background, so that we + // can have mica too. + void MainPage::_updateBackgroundForMica() + + { + const auto& theme = _settingsSource.GlobalSettings().CurrentTheme(); + + auto bgKey = (theme.Window() != nullptr && theme.Window().UseMica()) ? + L"SettingsPageMicaBackground" : + L"SettingsPageBackground"; + + if (auto bgColor = Resources().TryLookup(winrt::box_value(bgKey))) + { + SettingsNav().Background(winrt::WUX::Media::SolidColorBrush(winrt::unbox_value(bgColor))); + } + } + } diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.h b/src/cascadia/TerminalSettingsEditor/MainPage.h index ba86c6d50fd..50cdc8b86c2 100644 --- a/src/cascadia/TerminalSettingsEditor/MainPage.h +++ b/src/cascadia/TerminalSettingsEditor/MainPage.h @@ -67,6 +67,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation void _Navigate(hstring clickedItemTag, BreadcrumbSubPage subPage); void _Navigate(const Editor::ProfileViewModel& profile, BreadcrumbSubPage subPage, const bool focusDeleteButton = false); + void _updateBackgroundForMica(); + winrt::Microsoft::Terminal::Settings::Editor::ColorSchemesPageViewModel _colorSchemesPageVM{ nullptr }; Windows::UI::Xaml::Data::INotifyPropertyChanged::PropertyChanged_revoker _profileViewModelChangedRevoker; diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.xaml b/src/cascadia/TerminalSettingsEditor/MainPage.xaml index 401c684afe9..739a961f5b4 100644 --- a/src/cascadia/TerminalSettingsEditor/MainPage.xaml +++ b/src/cascadia/TerminalSettingsEditor/MainPage.xaml @@ -64,7 +64,7 @@ Date: Thu, 15 Dec 2022 12:28:15 -0600 Subject: [PATCH 3/4] Apply suggestions from code review Co-authored-by: Carlos Zamora --- src/cascadia/TerminalSettingsEditor/MainPage.cpp | 10 +++++----- src/cascadia/TerminalSettingsEditor/MainPage.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp index 70acb5c5f57..eed41d4de06 100644 --- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp +++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp @@ -55,7 +55,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation _settingsClone{ settings.Copy() } { InitializeComponent(); - _updateBackgroundForMica(); + _UpdateBackgroundForMica(); _InitializeProfilesList(); _colorSchemesPageVM = winrt::make(_settingsClone); @@ -102,7 +102,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation _settingsSource = settings; _settingsClone = settings.Copy(); - _updateBackgroundForMica(); + _UpdateBackgroundForMica(); // Deduce information about the currently selected item IInspectable lastBreadcrumb; @@ -644,16 +644,16 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation // If the theme asks for Mica, then drop out our background, so that we // can have mica too. - void MainPage::_updateBackgroundForMica() + void MainPage::_UpdateBackgroundForMica() { const auto& theme = _settingsSource.GlobalSettings().CurrentTheme(); - auto bgKey = (theme.Window() != nullptr && theme.Window().UseMica()) ? + const auto bgKey = (theme.Window() != nullptr && theme.Window().UseMica()) ? L"SettingsPageMicaBackground" : L"SettingsPageBackground"; - if (auto bgColor = Resources().TryLookup(winrt::box_value(bgKey))) + if (const auto bgColor = Resources().TryLookup(winrt::box_value(bgKey))) { SettingsNav().Background(winrt::WUX::Media::SolidColorBrush(winrt::unbox_value(bgColor))); } diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.h b/src/cascadia/TerminalSettingsEditor/MainPage.h index 50cdc8b86c2..e414e9f5f83 100644 --- a/src/cascadia/TerminalSettingsEditor/MainPage.h +++ b/src/cascadia/TerminalSettingsEditor/MainPage.h @@ -67,7 +67,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation void _Navigate(hstring clickedItemTag, BreadcrumbSubPage subPage); void _Navigate(const Editor::ProfileViewModel& profile, BreadcrumbSubPage subPage, const bool focusDeleteButton = false); - void _updateBackgroundForMica(); + void _UpdateBackgroundForMica(); winrt::Microsoft::Terminal::Settings::Editor::ColorSchemesPageViewModel _colorSchemesPageVM{ nullptr }; From e3bdefa1b8ee2bb2e0987f315d910ab2db5e7cf6 Mon Sep 17 00:00:00 2001 From: Dustin Howett Date: Thu, 15 Dec 2022 17:44:59 -0600 Subject: [PATCH 4/4] Format --- src/cascadia/TerminalSettingsEditor/MainPage.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp index eed41d4de06..6a074b858fd 100644 --- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp +++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp @@ -650,8 +650,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation const auto& theme = _settingsSource.GlobalSettings().CurrentTheme(); const auto bgKey = (theme.Window() != nullptr && theme.Window().UseMica()) ? - L"SettingsPageMicaBackground" : - L"SettingsPageBackground"; + L"SettingsPageMicaBackground" : + L"SettingsPageBackground"; if (const auto bgColor = Resources().TryLookup(winrt::box_value(bgKey))) {