jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-30 18:43:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Don't make new ThemeManager instance.

Browse source 
Took 8 minutes
This commit is contained in:
Lukas Brübach 2026-06-19 15:56:40 +02:00
parent 2e754f6ec0
commit c1098399da
2 changed files with 4 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/interface/palette_editor/palette_editor_dialog.cpp
View file

@ -267,7 +267,7 @@ void PaletteEditorDialog::onSave()
} }
// Record the active scheme in the user dir — never touch the system (read-only) dir // Record the active scheme in the user dir — never touch the system (read-only) dir
ThemeConfig globalCfg = ThemeConfig::fromThemeDir(themeDirPath); ThemeConfig globalCfg = themeManager->effectiveThemeConfig(themeName);
globalCfg.colorScheme = loadedScheme; globalCfg.colorScheme = loadedScheme;
globalCfg.save(userThemeDirPath); globalCfg.save(userThemeDirPath);

15
cockatrice/src/interface/theme_manager.cpp
View file

@ -190,7 +190,7 @@ QStringMap &ThemeManager::getAvailableThemes()
ThemeConfig ThemeManager::effectiveThemeConfig(const QString &themeName) ThemeConfig ThemeManager::effectiveThemeConfig(const QString &themeName)
{ {
const QString dirPath = ThemeManager().getAvailableThemes().value(themeName); const QString dirPath = getAvailableThemes().value(themeName);
const QString userDirPath = userThemeDirFor(themeName); const QString userDirPath = userThemeDirFor(themeName);
ThemeConfig userCfg = ThemeConfig::fromThemeDir(userDirPath); ThemeConfig userCfg = ThemeConfig::fromThemeDir(userDirPath);
@ -310,14 +310,8 @@ void ThemeManager::reloadCurrentTheme()
void ThemeManager::previewPalette(const PaletteConfig &cfg, const QString &scheme) void ThemeManager::previewPalette(const PaletteConfig &cfg, const QString &scheme)
{ {
const QString themeName = SettingsCache::instance().getThemeName(); const QString themeName = SettingsCache::instance().getThemeName();
const QString dirPath = getAvailableThemes().value(themeName);
const QString userDirPath = userThemeDirFor(themeName);
ThemeConfig themeCfg = ThemeConfig::fromThemeDir(userDirPath);
if (themeCfg.colorScheme.isEmpty() && themeCfg.styleName.isEmpty()) {
themeCfg = ThemeConfig::fromThemeDir(dirPath);
}
ThemeConfig themeCfg = effectiveThemeConfig(themeName);
applyStyleAndPalette(themeName, themeCfg, cfg, scheme); applyStyleAndPalette(themeName, themeCfg, cfg, scheme);
} }
@ -401,10 +395,7 @@ void ThemeManager::themeChangedSlot()
} }
// ThemeConfig — user override first, then system // ThemeConfig — user override first, then system
ThemeConfig themeCfg = ThemeConfig::fromThemeDir(userDirPath); ThemeConfig themeCfg = effectiveThemeConfig(themeName);
if (themeCfg.colorScheme.isEmpty() && themeCfg.styleName.isEmpty()) {
themeCfg = ThemeConfig::fromThemeDir(dirPath);
}
const QString activeScheme = isDarkMode(dirPath, userDirPath) ? "Dark" : "Light"; const QString activeScheme = isDarkMode(dirPath, userDirPath) ? "Dark" : "Light";