mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-11-05 09:33:25 -08:00
[Fonts] Make the editor's fallback and Reset preview-independent
- Add ThemeManager::defaultAppFont(), which resolves an unset role against the startup font instead of currentFonts, and use it in FontGridWidget::loadFonts so the grid never shows the live preview as the theme's default. - Reload the live theme in PaletteEditorDialog::onReset before re-reading the grid, so Reset restores the saved fonts before loadFonts resolves fallbacks.
This commit is contained in:
parent
c0aeaf72e8
commit
7472f69f01
4 changed files with 23 additions and 3 deletions
|
|
@ -76,9 +76,12 @@ void FontGridWidget::loadFonts(const FontConfig &cfg)
|
||||||
auto role = static_cast<AppFont::Role>(fontEnum.value(i));
|
auto role = static_cast<AppFont::Role>(fontEnum.value(i));
|
||||||
const FontRow &row = fontRows[role];
|
const FontRow &row = fontRows[role];
|
||||||
|
|
||||||
// Roles absent from the file resolve to the theme's effective font, so
|
// Roles absent from the file resolve the same way the runtime does: an unset
|
||||||
// unset roles visibly show the system default instead of blanks.
|
// role falls back to the config's InterfaceDefault, and only then to the
|
||||||
const QFont font = cfg.fonts.value(role, themeManager->appFont(role));
|
// startup font. appFont() would return the live preview instead, so Reset and
|
||||||
|
// a first load must not measure against it.
|
||||||
|
const QFont fallback = cfg.fonts.value(AppFont::InterfaceDefault, themeManager->defaultAppFont(role));
|
||||||
|
const QFont font = cfg.fonts.value(role, fallback);
|
||||||
row.familyCombo->setCurrentFont(font);
|
row.familyCombo->setCurrentFont(font);
|
||||||
|
|
||||||
int size = font.pointSize();
|
int size = font.pointSize();
|
||||||
|
|
|
||||||
|
|
@ -392,6 +392,10 @@ void PaletteEditorDialog::onReset()
|
||||||
{
|
{
|
||||||
workingConfig[loadedScheme] = savedConfig[loadedScheme];
|
workingConfig[loadedScheme] = savedConfig[loadedScheme];
|
||||||
paletteGrid->loadPalette(savedConfig[loadedScheme]);
|
paletteGrid->loadPalette(savedConfig[loadedScheme]);
|
||||||
|
// Restore the live theme before re-reading the grid: loadFonts resolves
|
||||||
|
// unset roles, and the preview has currentFonts pointing at the edited
|
||||||
|
// config until the theme is reloaded.
|
||||||
|
themeManager->reloadCurrentTheme();
|
||||||
fontGrid->loadFonts(savedFontConfig);
|
fontGrid->loadFonts(savedFontConfig);
|
||||||
seedAccentFromScheme(loadedScheme);
|
seedAccentFromScheme(loadedScheme);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -660,6 +660,14 @@ QFont ThemeManager::appFont(AppFont::Role role) const
|
||||||
return qApp->font();
|
return qApp->font();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QFont ThemeManager::defaultAppFont(AppFont::Role /*role*/) const
|
||||||
|
{
|
||||||
|
// No per-role scaling and no preview: an unset role resolves to the font
|
||||||
|
// captured at startup, which is what the theme falls back to once the
|
||||||
|
// editor closes.
|
||||||
|
return defaultFont;
|
||||||
|
}
|
||||||
|
|
||||||
void ThemeManager::themeChangedSlot()
|
void ThemeManager::themeChangedSlot()
|
||||||
{
|
{
|
||||||
QString themeName = SettingsCache::instance().getThemeName();
|
QString themeName = SettingsCache::instance().getThemeName();
|
||||||
|
|
|
||||||
|
|
@ -152,6 +152,11 @@ public:
|
||||||
/** @brief Resolves an application font role: the theme's stored [Fonts]
|
/** @brief Resolves an application font role: the theme's stored [Fonts]
|
||||||
* value when present, otherwise the application font. */
|
* value when present, otherwise the application font. */
|
||||||
QFont appFont(AppFont::Role role) const;
|
QFont appFont(AppFont::Role role) const;
|
||||||
|
/** @brief Resolves an application font role against the startup font only,
|
||||||
|
* ignoring any previewed config in currentFonts. Editors that show
|
||||||
|
* "what this role resolves to" must use this, because appFont()
|
||||||
|
* reflects a live preview while the editor is open. */
|
||||||
|
QFont defaultAppFont(AppFont::Role role) const;
|
||||||
|
|
||||||
QBrush &getBgBrush(Role zone);
|
QBrush &getBgBrush(Role zone);
|
||||||
QBrush getExtraBgBrush(Role zone, int zoneId = 0);
|
QBrush getExtraBgBrush(Role zone, int zoneId = 0);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue