Theme for settings#16479
Merged
zadjii-msft merged 4 commits intomicrosoft:mainfrom Jul 1, 2024
bundgaard:light_settings_v2
Merged
Theme for settings#16479zadjii-msft merged 4 commits intomicrosoft:mainfrom bundgaard:light_settings_v2
zadjii-msft merged 4 commits intomicrosoft:mainfrom
bundgaard:light_settings_v2
Conversation
Updated with JSON entries. Update _UpdateBackgroundForMica
4 tasks
Member
|
Hey so I spent another few minutes playing with this, and I think I realized what's wonky about mica and the settings UI. Basically, Mica will always be in the app theme, so a light themed Fortunately, the fix is actually pretty straightforward: diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
index be390f728..ea98ee83f 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
@@ -699,21 +699,23 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
}
}
- if (!isMicaAvailable)
- {
- return;
- }
const auto& theme = _settingsSource.GlobalSettings().CurrentTheme();
- const auto& requestedTheme = (theme.Settings() != nullptr) ? theme.Settings().RequestedTheme() : theme.RequestedTheme();
+ const bool hasThemeForSettings{ theme.Settings() != nullptr };
+ const auto& appTheme = theme.RequestedTheme();
+ const auto& requestedTheme = (hasThemeForSettings) ? theme.Settings().RequestedTheme() : appTheme;
RequestedTheme(requestedTheme);
- if (!isMicaAvailable)
- {
- return;
- }
+ // Mica gets it's appearance from the app's theme, not necessarily the
+ // Page's theme. In the case of dark app, light settings, mica will be a
+ // dark color, and the text will also be dark, making the UI _very_ hard
+ // to read. (and similarly in the inverse situation).
+ //
+ // To mitigate this, don't set the transparent background in the case
+ // that our theme is different than the app's.
+ const bool actuallyUseMica = isMicaAvailable && (appTheme == requestedTheme);
- const auto bgKey = (theme.Window() != nullptr && theme.Window().UseMica()) ?
+ const auto bgKey = (theme.Window() != nullptr && theme.Window().UseMica()) && actuallyUseMica ?
L"SettingsPageMicaBackground" :
L"SettingsPageBackground";
I think you should be able to take that delta and get this into a totally working state, and we can finally merge this in. Sorry for all the delays here. settings blob I was using {
"name": "GH#16479 Light app, no mica, light settings",
"window":
{
"applicationTheme": "light",
"useMica": false
},
"settings": { "theme": "light" }
},
{
"name": "GH#16479 Dark app, no mica, light settings",
"window":
{
"applicationTheme": "dark",
"useMica": false
},
"settings": { "theme": "light" }
},
{
"name": "GH#16479 Light app, yes mica, light settings",
"window":
{
"applicationTheme": "light",
"useMica": true
},
"settings": { "theme": "light" }
},
{
"name": "GH#16479 Dark app, yes mica, light settings",
"window":
{
"applicationTheme": "dark",
"useMica": true
},
"settings": { "theme": "light" }
},
{
"name": "GH#16479 Light app, no mica, dark settings",
"window":
{
"applicationTheme": "light",
"useMica": false
},
"settings": { "theme": "dark" }
},
{
"name": "GH#16479 Dark app, no mica, dark settings",
"window":
{
"applicationTheme": "dark",
"useMica": false
},
"settings": { "theme": "dark" }
},
{
"name": "GH#16479 Light app, yes mica, dark settings",
"window":
{
"applicationTheme": "light",
"useMica": true
},
"settings": { "theme": "dark" }
},
{
"name": "GH#16479 Dark app, yes mica, dark settings",
"window":
{
"applicationTheme": "dark",
"useMica": true
},
"settings": { "theme": "dark" }
} |
Member
|
I'm just gonna push the above delta to this branch after Build and get this merged in, cause I think this is pretty straightforward. |
zadjii-msft
added a commit
that referenced
this pull request
Jun 3, 2024
Member
carlos-zamora
left a comment
There was a problem hiding this comment.
Just want a response to that one comment before reviewing. Also don't forget to update the...
- schema
- docs
| X(bool, RainbowFrame, "experimental.rainbowFrame", false) \ | ||
| X(bool, UseMica, "useMica", false) | ||
|
|
||
| #define MTSM_THEME_SETTINGS_SETTINGS(X) \ |
Member
There was a problem hiding this comment.
Does this macro get called anywhere?
carlos-zamora
approved these changes
Jun 10, 2024
Member
carlos-zamora
left a comment
There was a problem hiding this comment.
Idk why ctrl+f didn't find the reference there... thanks!
lhecker
approved these changes
Jul 1, 2024
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Adds support for a new
settingsobject in the theme settings. This includes a single property,theme. This allows users to set a different theme from the app's requested theme, if they so choose.Closes #9231