starred/terminal
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2026-02-11 13:45:07 +00:00
Code Issues 19.0k Packages Projects Releases 20 Wiki Activity

Fix re-persisting the new legacy themes (#15160)

Browse Source 
Yep, I forgot to not write them back to the settings file here.

Regressed in #15108 

Closes #15152
This commit is contained in:
Mike Griese
2023-04-11 17:10:11 -05:00
committed by GitHub
parent 90bbd2927d
commit b4f65030e3
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/cascadia/TerminalSettingsModel/CascadiaSettingsSerialization.cpp
View File

@@ -56,6 +56,15 @@ constexpr std::wstring_view legacySystemThemeName{ L"legacySystem" };
constexpr std::wstring_view legacyDarkThemeName{ L"legacyDark" };
constexpr std::wstring_view legacyLightThemeName{ L"legacyLight" };
static constexpr std::array builtinThemes{
systemThemeName,
lightThemeName,
darkThemeName,
legacySystemThemeName,
legacyLightThemeName,
legacyDarkThemeName,
};
static constexpr std::wstring_view jsonExtension{ L".json" };
static constexpr std::wstring_view FragmentsSubDirectory{ L"\\Fragments" };
static constexpr std::wstring_view FragmentsPath{ L"\\Microsoft\\Windows Terminal\\Fragments" };
@@ -566,8 +575,9 @@ void SettingsLoader::_parse(const OriginTag origin, const winrt::hstring& source
if (const auto theme = Theme::FromJson(themeJson))
{
const auto& name{ theme->Name() };
if (origin != OriginTag::InBox &&
(name == systemThemeName || name == lightThemeName || name == darkThemeName || name == legacySystemThemeName || name == legacyDarkThemeName || name == legacyLightThemeName))
(std::ranges::find(builtinThemes, name) != builtinThemes.end()))
{
// If the theme didn't come from the in-box themes, and its
// name was one of the reserved names, then just ignore it.
@@ -1274,7 +1284,8 @@ Json::Value CascadiaSettings::ToJson() const
// Ignore the built in themes, when serializing the themes back out. We
// don't want to re-include them in the user settings file.
const auto theme{ winrt::get_self<Theme>(entry.Value()) };
if (theme->Name() == systemThemeName || theme->Name() == lightThemeName || theme->Name() == darkThemeName)
const auto& name{ theme->Name() };
if (std::ranges::find(builtinThemes, name) != builtinThemes.end())
{
continue;
}