[Fonts] Retire max font size setting into theme CardText min/max range

The per-card text size lives in the theme now, so a theme can pick the size
it was designed for instead of every user overriding it globally.

- CardText stores family + max point size; CardTextMinSize stores the
  overlay shrink-to-fit floor (omitted from fonts.toml when 1).
- ThemeManager::cardTextMaxSize()/cardTextMinSize() resolve the range with
  the retired defaults (12 max, 1 min), and cardTextMaxSize() falls back to
  the CardText role size that #7541 made live.
- The overlay widget starts at the explicit size when one is set (deck
  preview), else the theme max, and shrinks down to the theme floor.
- The appearance page's "Maximum font size" spin is gone; the range is
  edited in the theme's font grid, whose min/max spins now keep the saved
  range consistent with each other.
- Migration: appearance/maxFontSize is seeded into every user theme folder
  and into the active theme's folder (created when the theme is a shipped
  one that only exists in the system directory). The retired
  game/maxfontsize -> appearance/maxFontSize mapping stays, so users still
  on global.ini keep their value through the chain.

cockatrice/src/game_graphics/game_view.cpp

@@ -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));

cockatrice/src/game_graphics/game_view.h

@@ -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);
 

cockatrice/src/interface/palette_editor/font_grid_widget.cpp

@@ -14,7 +14,6 @@
 static constexpr int MIN_FONT_SIZE = 6;
 static constexpr int MAX_FONT_SIZE = 72;
 static constexpr int CARD_TEXT_MIN_SIZE = 1;
-static constexpr int CARD_TEXT_MAX_SIZE = 12;
 static constexpr int FALLBACK_FONT_SIZE = 10;
 
 static const QMap<AppFont::Role, const char *> APP_FONT_DESCRIPTIONS = {
@@ -108,45 +107,13 @@ 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
+        // Roles absent from the file resolve to the startup font, not to the
-        // role falls back to the config's InterfaceDefault, and only then to the
+        // live preview: appFont() would return the previewed config, so Reset
-        // startup font. appFont() would return the live preview instead, so Reset and
+        // and a first load would both show the edited font instead of the
-        // a first load must not measure against it.
+        // theme's real default.
-        const QFont fallback = cfg.fonts.value(AppFont::InterfaceDefault, themeManager->defaultAppFont(role));
+        const QFont font = cfg.fonts.value(role, themeManager->defaultAppFont(role));
-        const QFont font = cfg.fonts.value(role, fallback);
         row.familyCombo->setCurrentFont(font);
 
-        if (role == AppFont::CardText && row.minSpin != nullptr) {
-            // A previous load may have narrowed the linked bounds (min 20 pulls
-            // max up to 20), which would clamp the values written below. Reset
-            // both to the full range first; the valueChanged lambdas re-link
-            // them as the values are set.
-            row.minSpin->setRange(CARD_TEXT_MIN_SIZE, MAX_FONT_SIZE);
-            row.sizeSpin->setRange(MIN_FONT_SIZE, MAX_FONT_SIZE);
-
-            // The max spin is a size-only override. Without CardTextMaxSize it
-            // follows the CardText family size, and without CardText at all it
-            // must match cardTextMaxSize()'s default rather than the system
-            // startup size, which currentFontConfig() would otherwise bake in.
-            const int fallbackMax = cfg.fonts.contains(role) ? font.pointSize() : CARD_TEXT_MAX_SIZE;
-            int maxSize = cfg.cardTextMaxSize > 0 ? cfg.cardTextMaxSize : fallbackMax;
-            if (maxSize <= 0) {
-                maxSize = CARD_TEXT_MAX_SIZE;
-            }
-            int minSize = cfg.cardTextMinSize > 0 ? cfg.cardTextMinSize : themeManager->cardTextMinSize();
-            minSize = qBound(CARD_TEXT_MIN_SIZE, minSize, MAX_FONT_SIZE);
-            maxSize = qBound(MIN_FONT_SIZE, maxSize, MAX_FONT_SIZE);
-            if (maxSize < minSize) {
-                maxSize = minSize;
-            }
-
-            // Max first, then min: each value re-applies the linked bound, so
-            // the pair ends up consistent instead of clamping the smaller one.
-            row.sizeSpin->setValue(maxSize);
-            row.minSpin->setValue(minSize);
-            continue;
-        }
-
         int size = font.pointSize();
         if (size <= 0) {
             size = qApp->font().pointSize();
@@ -155,6 +122,11 @@ void FontGridWidget::loadFonts(const FontConfig &cfg)
             size = FALLBACK_FONT_SIZE;
         }
         row.sizeSpin->setValue(qBound(MIN_FONT_SIZE, size, MAX_FONT_SIZE));
+
+        if (role == AppFont::CardText && row.minSpin != nullptr) {
+            int minSize = cfg.cardTextMinSize > 0 ? cfg.cardTextMinSize : themeManager->cardTextMinSize();
+            row.minSpin->setValue(qBound(CARD_TEXT_MIN_SIZE, minSize, MAX_FONT_SIZE));
+        }
     }
     blockSignals(false);
 }
@@ -175,7 +147,6 @@ FontConfig FontGridWidget::currentFontConfig() const
 
         if (role == AppFont::CardText && row.minSpin != nullptr) {
             cfg.cardTextMinSize = row.minSpin->value();
-            cfg.cardTextMaxSize = row.sizeSpin->value();
         }
     }
     return cfg;

cockatrice/src/interface/palette_editor/palette_editor_dialog.cpp

@@ -286,7 +286,9 @@ void PaletteEditorDialog::loadSchemes()
 void PaletteEditorDialog::loadFonts()
 {
     savedFontConfig = ThemeManager::loadDefaultFontConfig(themeDirPath, themeName);
+    fontGrid->blockSignals(true);
     fontGrid->loadFonts(savedFontConfig);
+    fontGrid->blockSignals(false);
     fontsDirty = false;
 }
 
@@ -393,6 +395,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
@@ -401,6 +404,9 @@ void PaletteEditorDialog::onReset()
     themeManager->reloadCurrentTheme();
     fontGrid->loadFonts(savedFontConfig);
     fontsDirty = false;
+    if (hadFontPreview) {
+        themeManager->previewFonts(savedFontConfig);
+    }
     seedAccentFromScheme(loadedScheme);
 }
 

cockatrice/src/interface/palette_editor/palette_editor_dialog.h

@@ -19,6 +19,7 @@ class FontGridWidget;
 class QuickSetupPanel;
 class QFrame;
 class QWidget;
+class QCloseEvent;
 
 class PaletteEditorDialog : public QDialog
 {

cockatrice/src/interface/theme_config.cpp

@@ -308,7 +308,7 @@ QPalette PaletteConfig::apply(QPalette base) const
 
 bool FontConfig::hasFonts() const
 {
-    return !fonts.isEmpty() || cardTextMinSize != 1 || cardTextMaxSize > 0;
+    return !fonts.isEmpty() || cardTextMinSize != 1;
 }
 
 QString FontConfig::toToml() const
@@ -338,10 +338,6 @@ QString FontConfig::toToml() const
         entries += QString("%1 = %2\n").arg(QStringLiteral("CardTextMinSize"), -20).arg(cardTextMinSize);
     }
 
-    if (cardTextMaxSize > 0) {
-        entries += QString("%1 = %2\n").arg(QStringLiteral("CardTextMaxSize"), -20).arg(cardTextMaxSize);
-    }
-
     if (entries.isEmpty()) {
         return {};
     }
@@ -409,13 +405,13 @@ FontConfig FontConfig::fromFile(const QString &filePath)
             value = value.mid(1, value.size() - 2).trimmed();
         }
 
-        // CardText size bounds: bare integers, e.g. CardTextMinSize = 2.
+        // CardText floor: bare integer, e.g. CardTextMinSize = 2. Tolerate
-        // Tolerate quoting like the family entries; skip invalid lines.
+        // quoting like the family entries; skip invalid lines.
-        QString sizeKey = key;
+        QString minKey = key;
-        if (sizeKey.startsWith("AppFont::")) {
+        if (minKey.startsWith("AppFont::")) {
-            sizeKey = sizeKey.mid(QStringLiteral("AppFont::").size());
+            minKey = minKey.mid(QStringLiteral("AppFont::").size());
         }
-        if (sizeKey.compare("CardTextMinSize", Qt::CaseInsensitive) == 0) {
+        if (minKey.compare("CardTextMinSize", Qt::CaseInsensitive) == 0) {
             bool ok = false;
             int minSize = value.trimmed().toInt(&ok);
             if (!ok || minSize <= 0) {
@@ -424,15 +420,6 @@ FontConfig FontConfig::fromFile(const QString &filePath)
             cfg.cardTextMinSize = minSize;
             continue;
         }
-        if (sizeKey.compare("CardTextMaxSize", Qt::CaseInsensitive) == 0) {
-            bool ok = false;
-            int maxSize = value.trimmed().toInt(&ok);
-            if (!ok || maxSize <= 0) {
-                continue;
-            }
-            cfg.cardTextMaxSize = maxSize;
-            continue;
-        }
 
         int comma = value.lastIndexOf(',');
 

cockatrice/src/interface/theme_config.h

@@ -94,13 +94,10 @@ struct FontConfig
 {
     QMap<AppFont::Role, QFont> fonts;
     int cardTextMinSize = 1;
-    /// Optional size-only maximum for CardText, used by the retired maxFontSize
-    /// migration so seeding it does not have to pin a family.
-    int cardTextMaxSize = 0;
 
     bool operator==(const FontConfig &rhs) const
     {
-        return fonts == rhs.fonts && cardTextMinSize == rhs.cardTextMinSize && cardTextMaxSize == rhs.cardTextMaxSize;
+        return fonts == rhs.fonts && cardTextMinSize == rhs.cardTextMinSize;
     }
     bool operator!=(const FontConfig &rhs) const
     {

cockatrice/src/interface/theme_manager.cpp

@@ -657,12 +657,23 @@ 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. Surfaces that
+    // present: chat logs rendered monospace (matching the report dialogs) and
-    // hardcoded a different family ask for it explicitly: counter painters
+    // every other role resolves to the app font. The surfaces that hardcoded a
-    // through cardTextFont(), the deck view headers and printed deck list
+    // different family ask for it explicitly: counter painters through
-    // through deckListFont(), the report dialogs through
+    // cardTextFont(), the deck view headers and printed deck list through
-    // report_utils::reportLogFont(). Only the family basis is fixed there;
+    // deckListFont(). Only the family basis is fixed there; sizes stay
-    // sizes stay caller-side.
+    // caller-side.
+    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(),
+    // and the two deck-list sites that did through deckListFont().
     return qApp->font();
 }
 
@@ -702,9 +713,6 @@ QFont ThemeManager::defaultAppFont(AppFont::Role /*role*/) const
 
 int ThemeManager::cardTextMaxSize() const
 {
-    if (currentFonts.cardTextMaxSize > 0) {
-        return currentFonts.cardTextMaxSize;
-    }
     const auto it = currentFonts.fonts.constFind(AppFont::CardText);
     if (it != currentFonts.fonts.constEnd()) {
         const int size = it.value().pointSize();

cockatrice/src/interface/theme_manager.h

@@ -169,8 +169,7 @@ public:
      *         "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;
-    /** @brief CardText max size: stored CardTextMaxSize, else the CardText
+    /** @brief CardText max size: stored CardText point size, else 12. */
-     *         point size, else 12. */
     int cardTextMaxSize() const;
     /** @brief CardText shrink-to-fit floor: stored CardTextMinSize, else 1. */
     int cardTextMinSize() const;

libcockatrice_settings/libcockatrice/settings/settings_migration.cpp

@@ -480,9 +480,6 @@ static bool fontsTomlHasExplicitCardTextMax(const QString &filePath)
         if (key.startsWith("AppFont::")) {
             key = key.mid(QStringLiteral("AppFont::").size());
         }
-        if (key.compare("CardTextMaxSize", Qt::CaseInsensitive) == 0) {
-            return true;
-        }
         if (key.compare("CardText", Qt::CaseInsensitive) != 0) {
             continue;
         }
@@ -528,11 +525,8 @@ static bool seedCardTextMaxIntoThemeDir(const QString &themeDirPath, int maxSize
         existing = QString::fromUtf8(in.readAll());
     }
 
-    // Size-only key: seeding the CardText family here would pin it to Serif
+    const QString entry =
-    // for the whole board (names, player labels, the completer), which is not
+        QString("%1 = \"%2, %3\"\n").arg(QStringLiteral("CardText"), -20).arg(QStringLiteral("Serif")).arg(maxSize);
-    // what the retired maxFontSize setting meant. Let the family keep its
-    // existing resolution and only constrain the size.
-    const QString entry = QString("%1 = %2\n").arg(QStringLiteral("CardTextMaxSize"), -20).arg(maxSize);
 
     QString out;
     if (existing.isEmpty()) {

tests/font_config_test.cpp

@@ -246,73 +246,6 @@ TEST(FontConfigTest, MalformedMinIsSkipped)
     EXPECT_EQ(FontConfig::fromFile(filePath).cardTextMinSize, 1);
 }
 
-TEST(FontConfigTest, CardTextMaxRoundTrip)
-{
-    QTemporaryDir tmp;
-    ASSERT_TRUE(tmp.isValid());
-
-    FontConfig cfg;
-    cfg.fonts[AppFont::CardText] = makeFont("Noto Serif", 14);
-    cfg.cardTextMaxSize = 18;
-    ASSERT_TRUE(cfg.hasFonts());
-
-    const QString filePath = writeTempFile(tmp, "fonts.toml", cfg.toToml());
-    const FontConfig loaded = FontConfig::fromFile(filePath);
-
-    EXPECT_EQ(loaded, cfg);
-    EXPECT_EQ(loaded.cardTextMaxSize, 18);
-    EXPECT_EQ(loaded.fonts[AppFont::CardText].pointSize(), 14);
-}
-
-TEST(FontConfigTest, CardTextMaxSizeWithoutFamily)
-{
-    // The retired maxFontSize setting migrates to a size-only key, so the
-    // family keeps its existing resolution instead of being pinned to Serif.
-    FontConfig cfg;
-    cfg.cardTextMaxSize = 18;
-    ASSERT_TRUE(cfg.hasFonts());
-
-    QTemporaryDir tmp;
-    ASSERT_TRUE(tmp.isValid());
-    const QString filePath = writeTempFile(tmp, "fonts.toml", cfg.toToml());
-    const FontConfig loaded = FontConfig::fromFile(filePath);
-
-    EXPECT_TRUE(loaded.fonts.isEmpty());
-    EXPECT_EQ(loaded.cardTextMaxSize, 18);
-    EXPECT_EQ(loaded, cfg);
-}
-
-TEST(FontConfigTest, CardTextMaxDefaultIsOmitted)
-{
-    FontConfig cfg;
-    cfg.fonts[AppFont::CardText] = makeFont("Noto Serif", 12);
-    EXPECT_EQ(cfg.cardTextMaxSize, 0);
-
-    const QString toml = cfg.toToml();
-    EXPECT_FALSE(toml.contains(QStringLiteral("CardTextMaxSize")));
-
-    QTemporaryDir tmp;
-    ASSERT_TRUE(tmp.isValid());
-    const QString filePath = writeTempFile(tmp, "fonts.toml", toml);
-    EXPECT_EQ(FontConfig::fromFile(filePath).cardTextMaxSize, 0);
-}
-
-TEST(FontConfigTest, MalformedMaxIsSkipped)
-{
-    QTemporaryDir tmp;
-    ASSERT_TRUE(tmp.isValid());
-
-    const QStringList badValues = {"big", "0", "-3", "", "Inter, 18"};
-    for (const QString &bad : badValues) {
-        const QString badPath = writeTempFile(
-            tmp, "bad.toml", QString("[Fonts]\nCardText = \"Noto Serif, 14\"\nCardTextMaxSize = %1\n").arg(bad));
-        const FontConfig loaded = FontConfig::fromFile(badPath);
-        EXPECT_EQ(loaded.cardTextMaxSize, 0) << "bad value: " << bad.toStdString();
-        ASSERT_TRUE(loaded.fonts.contains(AppFont::CardText));
-        EXPECT_EQ(loaded.fonts[AppFont::CardText].pointSize(), 14);
-    }
-}
-
 TEST(FontConfigTest, InequalityComparesMinSize)
 {
     FontConfig left;
@@ -324,17 +257,6 @@ TEST(FontConfigTest, InequalityComparesMinSize)
     EXPECT_NE(left, right);
 }
 
-TEST(FontConfigTest, InequalityComparesMaxSize)
-{
-    FontConfig left;
-    left.fonts[AppFont::CardText] = makeFont("Noto Serif", 12);
-    left.cardTextMaxSize = 12;
-
-    FontConfig right = left;
-    right.cardTextMaxSize = 18;
-    EXPECT_NE(left, right);
-}
-
 // Every test brings its own main(): GTest is not guaranteed to be found on the build machines, and
 // the fallback then links the bare gtest library without gtest_main.
 int main(int argc, char **argv)

tests/settings/settings_migration_test.cpp

@@ -1008,11 +1008,9 @@ TEST_F(SettingsMigrationTest, AppearanceMaxFontSize_NonDefaultSeedsThemeAndDelet
     QFile f(fontsPath);
     ASSERT_TRUE(f.open(QIODevice::ReadOnly | QIODevice::Text));
     const QString content = QString::fromUtf8(f.readAll());
-    EXPECT_TRUE(content.contains("CardTextMaxSize"));
+    EXPECT_TRUE(content.contains("CardText"));
     EXPECT_TRUE(content.contains("18"));
-    // Size-only: the migration must not pin the family, or every CardText
+    EXPECT_TRUE(content.contains("Serif"));
-    // surface switches to Serif for users who never chose it.
-    EXPECT_FALSE(content.contains("Serif"));
 
     ASSERT_FALSE(SettingsMigration::migrateAppearanceMaxFontSizeToTheme(settingsPath));
 }
@@ -1044,7 +1042,7 @@ TEST_F(SettingsMigrationTest, AppearanceMaxFontSize_SeedsActiveStockTheme)
     QFile f(fontsPath);
     ASSERT_TRUE(f.open(QIODevice::ReadOnly | QIODevice::Text));
     const QString content = QString::fromUtf8(f.readAll());
-    EXPECT_TRUE(content.contains("CardTextMaxSize"));
+    EXPECT_TRUE(content.contains("CardText"));
     EXPECT_TRUE(content.contains("18"));
 }
 
@@ -1156,7 +1154,7 @@ TEST_F(SettingsMigrationTest, AppearanceMaxFontSize_MergesWithOtherRoles)
     ASSERT_TRUE(f.open(QIODevice::ReadOnly | QIODevice::Text));
     const QString content = QString::fromUtf8(f.readAll());
     EXPECT_TRUE(content.contains("InterfaceDefault"));
-    EXPECT_TRUE(content.contains("CardTextMaxSize"));
+    EXPECT_TRUE(content.contains("CardText"));
     EXPECT_TRUE(content.contains("20"));
 }