[Fonts] Fix pixel sizes and game overlay fonts from review

- Set the sizes the stylesheets carried with setPixelSize() rather than
  setPointSize(): home buttons (34), banner (24), home group box (20),
  the placeholder labels (14), the analytics drag handle (10), the EDHREC
  navigation buttons (24), the user info popup (11/14/11/10/11) and the
  game overlays (14/16/12). Points at 96 DPI were ~33% larger.
- The drag/total counters and tally columns keep the monospace family the
  stylesheets set, so digit widths stop changing as counts tick and
  white-space: pre stays aligned.
- applyDeckListFont() drops the cached tally rows before re-measuring, so
  previewing a larger DeckList font no longer leaves the tally clipped.
- Tally labels and the constructor/fontsChanged pairs in the shared-deck
  preview, quick setup, analytics panel, home box and public decks build
  their font once in a local lambda instead of twice.

cockatrice/src/game_graphics/game_view.cpp

@@ -26,6 +26,21 @@
 #include <libcockatrice/utility/qt_utils.h>
 #include <qnamespace.h>
 
+namespace
+{
+QFont deckOverlayFont(int pixelSize, bool bold)
+{
+    // The drag/total counters and the tally columns are in-game overlays, not
+    // deck list text: keep the monospace family the stylesheets used to set so
+    // digit widths stay stable as counts tick and `white-space: pre` lines up.
+    QFont font(QStringLiteral("monospace"));
+    font.setStyleHint(QFont::Monospace);
+    font.setPixelSize(pixelSize);
+    font.setBold(bold);
+    return font;
+}
+} // namespace
+
 // QRubberBand calls raise() in showEvent() and changeEvent() to stay on top of siblings.
 // This subclass disables that behavior so dragCountLabel can appear above it.
 class SelectionRubberBand : public QRubberBand
@@ -102,40 +117,26 @@ GameView::GameView(GameScene *scene, QWidget *parent) : QGraphicsView(scene, par
     tallyLayout->setSpacing(2);
     tallyContainer->hide();
 
-    applyDeckListFont();
+    applyDeckOverlayFonts();
-    connect(themeManager, &ThemeManager::fontsChanged, this, &GameView::applyDeckListFont);
 }
 
-void GameView::applyDeckListFont()
+void GameView::applyDeckOverlayFonts()
 {
-    // Family comes from the DeckList theme role; the pixel sizes and bold
+    dragCountLabel->setFont(deckOverlayFont(14, true));
-    // weights previously carried by the stylesheets stay caller-side.
+    totalCountLabel->setFont(deckOverlayFont(16, true));
-    QFont dragFont = themeManager->appFont(AppFont::DeckList);
+    tallyContainer->setFont(deckOverlayFont(12, false));
-    dragFont.setPointSize(14);
-    dragFont.setWeight(QFont::Bold);
-    dragCountLabel->setFont(dragFont);
-
-    QFont totalFont = themeManager->appFont(AppFont::DeckList);
-    totalFont.setPointSize(16);
-    totalFont.setWeight(QFont::Bold);
-    totalCountLabel->setFont(totalFont);
-
-    QFont tallyFont = themeManager->appFont(AppFont::DeckList);
-    tallyFont.setPointSize(12);
-    tallyContainer->setFont(tallyFont);
     for (int i = 0; i < tallyLayout->count(); ++i) {
         if (auto *label = qobject_cast<QLabel *>(tallyLayout->itemAt(i)->widget())) {
-            QFont labelFont = themeManager->appFont(AppFont::DeckList);
+            // Count column (odd positions) keeps the bold emphasis.
-            // Count column (odd positions) keeps the 14px bold emphasis.
+            const bool count = i % 2 == 1;
-            if (i % 2 == 1) {
+            label->setFont(deckOverlayFont(count ? 14 : 12, count));
-                labelFont.setPointSize(14);
-                labelFont.setWeight(QFont::Bold);
-            } else {
-                labelFont.setPointSize(12);
-            }
-            label->setFont(labelFont);
         }
     }
+
+    // The container keeps the size computed from the previous fonts, so force
+    // rebuildTallyLabels() to re-measure it instead of reusing cachedTallyRows.
+    cachedTallyRows.clear();
+    updateTotalSelectionCount();
 }
 
 void GameView::resizeEvent(QResizeEvent *event)
@@ -266,18 +267,13 @@ QSize GameView::rebuildTallyLabels(const QList<TallyRow> &entries)
     for (const TallyRow &entry : entries) {
         auto *nameLabel = new QLabel(entry.name, tallyContainer);
         nameLabel->setStyleSheet(nameStyle);
-        QFont nameFont = themeManager->appFont(AppFont::DeckList);
+        nameLabel->setFont(deckOverlayFont(12, false));
-        nameFont.setPointSize(12);
-        nameLabel->setFont(nameFont);
         nameLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
         tallyLayout->addWidget(nameLabel, row, 0);
 
         auto *countLabel = new QLabel(entry.value, tallyContainer);
         countLabel->setStyleSheet(countStyle);
-        QFont countFont = themeManager->appFont(AppFont::DeckList);
+        countLabel->setFont(deckOverlayFont(14, true));
-        countFont.setPointSize(14);
-        countFont.setWeight(QFont::Bold);
-        countLabel->setFont(countFont);
         countLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
         tallyLayout->addWidget(countLabel, row, 1);
 

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 applyDeckListFont();
+    void applyDeckOverlayFonts();
 public slots:
     void updateSceneRect(const QRectF &rect);
 

cockatrice/src/interface/palette_editor/quick_setup_panel.cpp

@@ -30,16 +30,14 @@ QuickSetupPanel::QuickSetupPanel(QWidget *parent) : QWidget(parent)
     labelLow = new QLabel(this);
     labelHigh = new QLabel(this);
     // Family comes from the InterfaceDefault theme role; the *0.82 size stays caller-side.
+    auto applySmallFont = [this]() {
         QFont small = themeManager->appFont(AppFont::InterfaceDefault);
         small.setPointSizeF(small.pointSizeF() * 0.82);
         labelLow->setFont(small);
         labelHigh->setFont(small);
-    connect(themeManager, &ThemeManager::fontsChanged, this, [this]() {
+    };
-        QFont refreshedSmall = themeManager->appFont(AppFont::InterfaceDefault);
+    applySmallFont();
-        refreshedSmall.setPointSizeF(refreshedSmall.pointSizeF() * 0.82);
+    connect(themeManager, &ThemeManager::fontsChanged, this, applySmallFont);
-        labelLow->setFont(refreshedSmall);
-        labelHigh->setFont(refreshedSmall);
-    });
     QPalette dimmed = labelLow->palette();
     dimmed.setColor(QPalette::WindowText, qApp->palette().color(QPalette::Mid));
     labelLow->setPalette(dimmed);

cockatrice/src/interface/widgets/deck_analytics/resizable_panel.cpp

@@ -99,14 +99,13 @@ ResizablePanel::ResizablePanel(const QString &_typeId, AbstractAnalyticsPanelWid
                                       "QPushButton:hover { background: %4; }")
                                   .arg(mid.name(), dark.name(), placeholderText.name(), midLight.name()));
     // Family comes from the InterfaceDefault theme role; the 10px size stays caller-side.
+    auto applyDragFont = [this]() {
         QFont dragFont = themeManager->appFont(AppFont::InterfaceDefault);
-    dragFont.setPointSize(10);
+        dragFont.setPixelSize(10);
         dragButton->setFont(dragFont);
-    connect(themeManager, &ThemeManager::fontsChanged, this, [this]() {
+    };
-        QFont refreshedFont = themeManager->appFont(AppFont::InterfaceDefault);
+    applyDragFont();
-        refreshedFont.setPointSize(10);
+    connect(themeManager, &ThemeManager::fontsChanged, this, applyDragFont);
-        dragButton->setFont(refreshedFont);
-    });
 
     resizeHandle->setStyleSheet(QString("QWidget { background: qlineargradient(x1:0, y1:0, x2:0, y2:1, "
                                         "stop:0 %1, stop:1 %2); }")

cockatrice/src/interface/widgets/dialogs/dlg_shared_decks_preview.cpp

@@ -37,15 +37,13 @@ DlgSharedDecksPreview::DlgSharedDecksPreview(QWidget *parent,
     auto *titleLabel =
         new QLabel(tr("Share: %1").arg((shareName.isEmpty() ? tr("Untitled") : shareName).toHtmlEscaped()), this);
     // Family comes from the InterfaceDefault theme role; the +2 size and bold stay caller-side.
+    auto applyTitleFont = [titleLabel]() {
         QFont titleFont = QtUtils::boldFont(themeManager->appFont(AppFont::InterfaceDefault));
         titleFont.setPointSize(titleFont.pointSize() + 2);
         titleLabel->setFont(titleFont);
-    connect(themeManager, &ThemeManager::fontsChanged, this, [titleLabel]() {
+    };
-        QFont refreshedFont = themeManager->appFont(AppFont::InterfaceDefault);
+    applyTitleFont();
-        refreshedFont.setBold(true);
+    connect(themeManager, &ThemeManager::fontsChanged, this, applyTitleFont);
-        refreshedFont.setPointSize(refreshedFont.pointSize() + 2);
-        titleLabel->setFont(refreshedFont);
-    });
     mainLayout->addWidget(titleLabel);
 
     if (!serverText.isEmpty()) {

cockatrice/src/interface/widgets/general/display/banner_widget.cpp

@@ -65,7 +65,7 @@ void BannerWidget::applyInterfaceDefaultFont()
     // Family comes from the InterfaceDefault theme role; the 24px size and
     // bold weight previously carried by the stylesheet stay caller-side.
     QFont bannerFont = themeManager->appFont(AppFont::InterfaceDefault);
-    bannerFont.setPointSize(24);
+    bannerFont.setPixelSize(24);
     bannerFont.setWeight(QFont::Bold);
     bannerLabel->setFont(bannerFont);
 }

cockatrice/src/interface/widgets/general/home_styled_button.cpp

@@ -33,7 +33,7 @@ void HomeStyledButton::applyInterfaceDefaultFont()
     // Family comes from the InterfaceDefault theme role; the 34px size and
     // bold weight previously carried by the stylesheet stay caller-side.
     QFont buttonFont = themeManager->appFont(AppFont::InterfaceDefault);
-    buttonFont.setPointSize(34);
+    buttonFont.setPixelSize(34);
     buttonFont.setWeight(QFont::Bold);
     setFont(buttonFont);
 }

cockatrice/src/interface/widgets/general/home_widget.cpp

@@ -300,14 +300,13 @@ QGroupBox *HomeWidget::createButtons()
     }
 )");
     // Family comes from the InterfaceDefault theme role; the 20px size stays caller-side.
+    auto applyBoxFont = [box]() {
         QFont boxFont = themeManager->appFont(AppFont::InterfaceDefault);
-    boxFont.setPointSize(20);
+        boxFont.setPixelSize(20);
         box->setFont(boxFont);
-    connect(themeManager, &ThemeManager::fontsChanged, this, [box]() {
+    };
-        QFont refreshedFont = themeManager->appFont(AppFont::InterfaceDefault);
+    applyBoxFont();
-        refreshedFont.setPointSize(20);
+    connect(themeManager, &ThemeManager::fontsChanged, this, applyBoxFont);
-        box->setFont(refreshedFont);
-    });
     box->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     QVBoxLayout *boxLayout = new QVBoxLayout;
     boxLayout->setAlignment(Qt::AlignHCenter);

cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp

@@ -55,6 +55,6 @@ void PrintingSelectorPlaceholderWidget::applyInterfaceDefaultFont()
 {
     // Family comes from the InterfaceDefault theme role; the 14px size stays caller-side.
     QFont placeholderFont = themeManager->appFont(AppFont::InterfaceDefault);
-    placeholderFont.setPointSize(14);
+    placeholderFont.setPixelSize(14);
     textLabel->setFont(placeholderFont);
 }

cockatrice/src/interface/widgets/server/user/user_info_popup.cpp

@@ -481,7 +481,7 @@ void UserInfoPopup::applyTheme()
 
     gamesLabel->setStyleSheet(QStringLiteral("color:%1; background:transparent;").arg(colorStr(theme.subText)));
     QFont gamesLabelFont = themeManager->appFont(AppFont::InterfaceDefault);
-    gamesLabelFont.setPointSize(11);
+    gamesLabelFont.setPixelSize(11);
     gamesLabelFont.setWeight(QFont::Bold);
     gamesLabel->setFont(gamesLabelFont);
 
@@ -489,13 +489,13 @@ void UserInfoPopup::applyTheme()
                                              "QPushButton:hover{color:%2;}")
                                   .arg(colorStr(theme.subText), colorStr(theme.text)));
     QFont refreshFont = themeManager->appFont(AppFont::InterfaceDefault);
-    refreshFont.setPointSize(14);
+    refreshFont.setPixelSize(14);
     refreshBtn->setFont(refreshFont);
 
     gamesStatus->setStyleSheet(
         QStringLiteral("color:%1; padding:10px; background:transparent;").arg(colorStr(theme.statusText)));
     QFont statusFont = themeManager->appFont(AppFont::InterfaceDefault);
-    statusFont.setPointSize(11);
+    statusFont.setPixelSize(11);
     gamesStatus->setFont(statusFont);
 
     gamesView->setStyleSheet(QStringLiteral("QListView{background:%1;border:none;}"
@@ -508,7 +508,7 @@ void UserInfoPopup::applyTheme()
                        "QPushButton:hover{color:%3;background:%4;}")
             .arg(colorStr(theme.closeBg), colorStr(theme.subText), colorStr(theme.text), colorStr(theme.closeHover)));
     QFont closeFont = themeManager->appFont(AppFont::InterfaceDefault);
-    closeFont.setPointSize(10);
+    closeFont.setPixelSize(10);
     closeBtn->setFont(closeFont);
 
     header->update();
@@ -533,7 +533,7 @@ static QPushButton *makeBtn(const QString &label, const QString &tip, QWidget *p
                               colorStr(t.text), colorStr(t.buttonPressed), colorStr(t.buttonDisabled)));
     // Family comes from the InterfaceDefault theme role; the 11px size stays caller-side.
     QFont btnFont = themeManager->appFont(AppFont::InterfaceDefault);
-    btnFont.setPointSize(11);
+    btnFont.setPixelSize(11);
     b->setFont(btnFont);
     return b;
 }

cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp

@@ -104,7 +104,7 @@ void EdhrecCommanderApiResponseBracketNavigationWidget::updateOptionButtonSelect
         const bool selected = (it.key() == selectedKey);
         it.value()->setStyleSheet(selected ? QStringLiteral("background-color: lightblue;") : QString());
         QFont buttonFont = themeManager->appFont(AppFont::InterfaceDefault);
-        buttonFont.setPointSize(24);
+        buttonFont.setPixelSize(24);
         buttonFont.setWeight(selected ? QFont::Bold : QFont::Normal);
         it.value()->setFont(buttonFont);
     }

cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp

@@ -106,7 +106,7 @@ void EdhrecCommanderApiResponseBudgetNavigationWidget::updateOptionButtonSelecti
         const bool selected = (it.key() == selectedKey);
         it.value()->setStyleSheet(selected ? QStringLiteral("background-color: lightblue;") : QString());
         QFont buttonFont = themeManager->appFont(AppFont::InterfaceDefault);
-        buttonFont.setPointSize(24);
+        buttonFont.setPixelSize(24);
         buttonFont.setWeight(selected ? QFont::Bold : QFont::Normal);
         it.value()->setFont(buttonFont);
     }

cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp

@@ -71,7 +71,7 @@ void EdhrecCommanderApiResponseNavigationWidget::applyInterfaceDefaultFont()
 {
     // Family comes from the InterfaceDefault theme role; the 24px size stays caller-side.
     QFont navFont = themeManager->appFont(AppFont::InterfaceDefault);
-    navFont.setPointSize(24);
+    navFont.setPixelSize(24);
     comboPushButton->setFont(navFont);
     averageDeckPushButton->setFont(navFont);
 }

cockatrice/src/interface/widgets/tabs/tab_public_decks.cpp

@@ -47,10 +47,11 @@ TabPublicDecks::TabPublicDecks(TabSupervisor *_tabSupervisor, AbstractClient *_c
 
     titleLabel = new QLabel(tr("Public decks of %1").arg(userName.toHtmlEscaped()), this);
     // Family comes from the InterfaceDefault theme role; bold stays caller-side.
+    auto applyTitleFont = [this]() {
         titleLabel->setFont(QtUtils::boldFont(themeManager->appFont(AppFont::InterfaceDefault)));
-    connect(themeManager, &ThemeManager::fontsChanged, this, [this]() {
+    };
-        titleLabel->setFont(QtUtils::boldFont(themeManager->appFont(AppFont::InterfaceDefault)));
+    applyTitleFont();
-    });
+    connect(themeManager, &ThemeManager::fontsChanged, this, applyTitleFont);
 
     auto *headerLayout = new QHBoxLayout;
     headerLayout->addWidget(titleLabel);

cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp

@@ -53,6 +53,6 @@ void VisualDeckEditorPlaceholderWidget::applyInterfaceDefaultFont()
 {
     // Family comes from the InterfaceDefault theme role; the 14px size stays caller-side.
     QFont placeholderFont = themeManager->appFont(AppFont::InterfaceDefault);
-    placeholderFont.setPointSize(14);
+    placeholderFont.setPixelSize(14);
     textLabel->setFont(placeholderFont);
 }