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