mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-11-05 09:33:25 -08:00
Compare commits
9 commits
42895e92a3
...
64d7e28192
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
64d7e28192 | ||
|
|
4b616a17e8 | ||
|
|
f6b8edc50c | ||
|
|
b5250b440b | ||
|
|
1407a2e142 | ||
|
|
ee2e0a9fa0 | ||
|
|
145f7adf73 | ||
|
|
2a3a31c24c | ||
|
|
ecc3ecd4ea |
7 changed files with 30 additions and 14 deletions
|
|
@ -117,10 +117,11 @@ GameView::GameView(GameScene *scene, QWidget *parent) : QGraphicsView(scene, par
|
|||
tallyLayout->setSpacing(2);
|
||||
tallyContainer->hide();
|
||||
|
||||
applyDeckOverlayFonts();
|
||||
applyDeckListFont();
|
||||
connect(themeManager, &ThemeManager::fontsChanged, this, &GameView::applyDeckListFont);
|
||||
}
|
||||
|
||||
void GameView::applyDeckOverlayFonts()
|
||||
void GameView::applyDeckListFont()
|
||||
{
|
||||
dragCountLabel->setFont(deckOverlayFont(14, true));
|
||||
totalCountLabel->setFont(deckOverlayFont(16, true));
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ private slots:
|
|||
void refreshShortcuts();
|
||||
void updateTotalSelectionCount(const QSize &viewSize = QSize());
|
||||
void setFocusDisabled(bool disabled);
|
||||
void applyDeckOverlayFonts();
|
||||
void applyDeckListFont();
|
||||
public slots:
|
||||
void updateSceneRect(const QRectF &rect);
|
||||
|
||||
|
|
|
|||
|
|
@ -79,12 +79,11 @@ void FontGridWidget::loadFonts(const FontConfig &cfg)
|
|||
auto role = static_cast<AppFont::Role>(fontEnum.value(i));
|
||||
const FontRow &row = fontRows[role];
|
||||
|
||||
// Roles absent from the file resolve the same way the runtime does: an unset
|
||||
// role falls back to the config's InterfaceDefault, and only then to the
|
||||
// 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);
|
||||
// Roles absent from the file resolve to the startup font, not to the
|
||||
// live preview: appFont() would return the previewed config, so Reset
|
||||
// and a first load would both show the edited font instead of the
|
||||
// theme's real default.
|
||||
const QFont font = cfg.fonts.value(role, themeManager->defaultAppFont(role));
|
||||
row.familyCombo->setCurrentFont(font);
|
||||
|
||||
int size = font.pointSize();
|
||||
|
|
|
|||
|
|
@ -285,7 +285,9 @@ void PaletteEditorDialog::loadSchemes()
|
|||
void PaletteEditorDialog::loadFonts()
|
||||
{
|
||||
savedFontConfig = ThemeManager::loadDefaultFontConfig(themeDirPath, themeName);
|
||||
fontGrid->blockSignals(true);
|
||||
fontGrid->loadFonts(savedFontConfig);
|
||||
fontGrid->blockSignals(false);
|
||||
fontsDirty = false;
|
||||
}
|
||||
|
||||
|
|
@ -392,6 +394,7 @@ void PaletteEditorDialog::onSave()
|
|||
|
||||
void PaletteEditorDialog::onReset()
|
||||
{
|
||||
const bool hadFontPreview = fontsDirty;
|
||||
workingConfig[loadedScheme] = savedConfig[loadedScheme];
|
||||
paletteGrid->loadPalette(savedConfig[loadedScheme]);
|
||||
// Restore the live theme before re-reading the grid: loadFonts resolves
|
||||
|
|
@ -400,6 +403,9 @@ void PaletteEditorDialog::onReset()
|
|||
themeManager->reloadCurrentTheme();
|
||||
fontGrid->loadFonts(savedFontConfig);
|
||||
fontsDirty = false;
|
||||
if (hadFontPreview) {
|
||||
themeManager->previewFonts(savedFontConfig);
|
||||
}
|
||||
seedAccentFromScheme(loadedScheme);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ class FontGridWidget;
|
|||
class QuickSetupPanel;
|
||||
class QFrame;
|
||||
class QWidget;
|
||||
class QCloseEvent;
|
||||
|
||||
class PaletteEditorDialog : public QDialog
|
||||
{
|
||||
|
|
|
|||
|
|
@ -657,9 +657,17 @@ QFont ThemeManager::appFont(AppFont::Role role) const
|
|||
}
|
||||
|
||||
// Role fallbacks preserve the pre-theme defaults when no fonts.toml is
|
||||
// present: an unset role resolves to the application font, so the result is
|
||||
// identical to before. The report dialogs that used to hardcode monospace
|
||||
// ask for it explicitly (report_utils::reportLogFont), and the counter
|
||||
// present: chat logs rendered monospace (matching the report dialogs),
|
||||
// card text from a serif basis, everything else from the app font.
|
||||
if (role == AppFont::ChatLog) {
|
||||
// ChatView never set a font before the theme role existed, so an unset
|
||||
// ChatLog must keep resolving to the application font. The report
|
||||
// dialogs that used to hardcode monospace ask for it explicitly
|
||||
// (report_utils::reportLogFont) instead of through this fallback.
|
||||
return qApp->font();
|
||||
}
|
||||
// No per-role scaling: an unset role resolves to the application font, so
|
||||
// with no fonts.toml present the result is identical to before. The counter
|
||||
// painters that used to hardcode Serif ask for it through cardTextFont().
|
||||
return qApp->font();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -150,8 +150,9 @@ public:
|
|||
// when present, otherwise a palette-accent-derived fallback.
|
||||
QColor appColor(AppColor::Role role) const;
|
||||
/** @brief Resolves an application font role: the theme's stored [Fonts]
|
||||
* value when present, otherwise a per-role fallback (serif basis
|
||||
* for CardText, the application font for the remaining roles). */
|
||||
* value when present, otherwise a per-role fallback (monospace for
|
||||
* ChatLog, serif basis for CardText, the application font for the
|
||||
* remaining roles). */
|
||||
QFont appFont(AppFont::Role role) const;
|
||||
/** @brief Whether the active theme defines this role in fonts.toml. */
|
||||
bool hasAppFont(AppFont::Role role) const;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue