[Fonts] Migrate ChatLog surfaces to theme font role

cockatrice/src/interface/theme_manager.cpp

@@ -12,6 +12,7 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QFlags>
+#include <QFontDatabase>
 #include <QGuiApplication>
 #include <QIODevice>
 #include <QLatin1Char>
@@ -655,8 +656,24 @@ QFont ThemeManager::appFont(AppFont::Role role) const
         return it.value();
     }
 
-    // No per-role scaling: every unset role resolves to the application font,
+    // Role fallbacks preserve the pre-theme defaults when no fonts.toml is
-    // so with no fonts.toml present the result is identical to before.
+    // 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) {
+        QFont monoFont(QStringLiteral("monospace"));
+        monoFont.setStyleHint(QFont::Monospace);
+        const int systemPointSize = QFontDatabase::systemFont(QFontDatabase::GeneralFont).pointSize();
+        if (systemPointSize > 0) {
+            monoFont.setPointSize(systemPointSize);
+        }
+        return monoFont;
+    }
+    if (role == AppFont::CardText) {
+        return QFont(QStringLiteral("Serif"));
+    }
+
+    // No per-role scaling: every other unset role resolves to the application
+    // font, so with no fonts.toml present the result is identical to before.
     return qApp->font();
 }
 

cockatrice/src/interface/theme_manager.h

@@ -150,7 +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 the application font. */
+     *         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 Resolves an application font role against the startup font only,
      *         ignoring any previewed config in currentFonts. Editors that show

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

@@ -1,5 +1,6 @@
 #include "dlg_my_reports.h"
 
+#include "../interface/theme_manager.h"
 #include "../utility/report_utils.h"
 #include "abstract_client.h"
 #include "libcockatrice/protocol/pb/response.pb.h"
@@ -70,13 +71,8 @@ DlgMyReports::DlgMyReports(AbstractClient *_client, QWidget *parent)
     auto *chatGroup = new QGroupBox(tr("Chat Log Context"));
     chatLogEdit = new QTextEdit;
     chatLogEdit->setReadOnly(true);
-    QFont monoFont("monospace");
+    applyChatLogFont();
-    monoFont.setStyleHint(QFont::Monospace);
+    connect(themeManager, &ThemeManager::fontsChanged, this, &DlgMyReports::applyChatLogFont);
-    const int systemPointSize = QFontDatabase::systemFont(QFontDatabase::GeneralFont).pointSize();
-    if (systemPointSize > 0) {
-        monoFont.setPointSize(systemPointSize);
-    }
-    chatLogEdit->setFont(monoFont);
     auto *chatLayout = new QVBoxLayout(chatGroup);
     chatLayout->setContentsMargins(4, 4, 4, 4);
     chatLayout->addWidget(chatLogEdit);
@@ -129,6 +125,18 @@ DlgMyReports::DlgMyReports(AbstractClient *_client, QWidget *parent)
     refreshList();
 }
 
+void DlgMyReports::applyChatLogFont()
+{
+    // Family comes from the ChatLog theme role; size stays caller-side as before.
+    QFont monoFont = themeManager->appFont(AppFont::ChatLog);
+    monoFont.setStyleHint(QFont::Monospace);
+    const int systemPointSize = QFontDatabase::systemFont(QFontDatabase::GeneralFont).pointSize();
+    if (systemPointSize > 0) {
+        monoFont.setPointSize(systemPointSize);
+    }
+    chatLogEdit->setFont(monoFont);
+}
+
 void DlgMyReports::refreshList()
 {
     selectedReportIdBeforeRefresh = selectedReportId;

cockatrice/src/interface/widgets/dialogs/dlg_my_reports.h

@@ -29,6 +29,7 @@ private slots:
     void reportDetailsResponse(const Response &response);
     void addComment();
     void addCommentResponse(const Response &response);
+    void applyChatLogFont();
 
 private:
     void loadReportDetails(const ServerInfo_Report &report);

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

@@ -1,5 +1,6 @@
 #include "dlg_report_user.h"
 
+#include "../interface/theme_manager.h"
 #include "abstract_client.h"
 #include "libcockatrice/protocol/pb/response.pb.h"
 
@@ -92,13 +93,8 @@ DlgReportUser::DlgReportUser(AbstractClient *_client,
     auto *chatLayout = new QVBoxLayout(chatGroup);
     chatLogEdit = new QTextEdit;
     chatLogEdit->setReadOnly(true);
-    QFont monoFont("monospace");
+    applyChatLogFont();
-    monoFont.setStyleHint(QFont::Monospace);
+    connect(themeManager, &ThemeManager::fontsChanged, this, &DlgReportUser::applyChatLogFont);
-    const int systemPointSize = QFontDatabase::systemFont(QFontDatabase::GeneralFont).pointSize();
-    if (systemPointSize > 0) {
-        monoFont.setPointSize(systemPointSize);
-    }
-    chatLogEdit->setFont(monoFont);
     if (!_autoChatLog.isEmpty()) {
         chatLogEdit->setPlainText(_autoChatLog);
     } else {
@@ -127,6 +123,18 @@ DlgReportUser::DlgReportUser(AbstractClient *_client,
     layout->addWidget(buttonBox);
 }
 
+void DlgReportUser::applyChatLogFont()
+{
+    // Family comes from the ChatLog theme role; size stays caller-side as before.
+    QFont monoFont = themeManager->appFont(AppFont::ChatLog);
+    monoFont.setStyleHint(QFont::Monospace);
+    const int systemPointSize = QFontDatabase::systemFont(QFontDatabase::GeneralFont).pointSize();
+    if (systemPointSize > 0) {
+        monoFont.setPointSize(systemPointSize);
+    }
+    chatLogEdit->setFont(monoFont);
+}
+
 void DlgReportUser::actSubmit()
 {
     const QString description = descriptionEdit->toPlainText().trimmed();

cockatrice/src/interface/widgets/dialogs/dlg_report_user.h

@@ -27,6 +27,7 @@ public:
 private slots:
     void actSubmit();
     void reportResponse(const Response &response);
+    void applyChatLogFont();
 
 private:
     static QString categoryLabel(const QString &key);

cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp

@@ -4,6 +4,7 @@
 #include "../../client/sound_engine.h"
 #include "../../interface/card_localization.h"
 #include "../../interface/pixel_map_generator.h"
+#include "../../interface/theme_manager.h"
 #include "../../tabs/tab_supervisor.h"
 #include "../user/user_context_menu.h"
 #include "../user/user_list_manager.h"
@@ -63,6 +64,9 @@ ChatView::ChatView(TabSupervisor *_tabSupervisor, AbstractGame *_game, bool _sho
 
     connect(&SettingsCache::instance(), &SettingsCache::themeChanged, this, &ChatView::adjustColorsToPalette);
 
+    applyChatFont();
+    connect(themeManager, &ThemeManager::fontsChanged, this, &ChatView::applyChatFont);
+
     userContextMenu = new UserContextMenu(tabSupervisor, this, game);
     connect(userContextMenu, SIGNAL(openMessageDialog(QString, bool)), this, SIGNAL(openMessageDialog(QString, bool)));
 
@@ -108,6 +112,16 @@ void ChatView::adjustColorsToPalette()
     QTimer::singleShot(0, this, &ChatView::refreshBlockColors);
 }
 
+void ChatView::applyChatFont()
+{
+    // Family comes from the ChatLog theme role; the message char formats carry
+    // no family of their own, so they (and new content) follow the widget and
+    // document default fonts. Weights/italics stay caller-side as before.
+    const QFont chatFont = themeManager->appFont(AppFont::ChatLog);
+    setFont(chatFont);
+    document()->setDefaultFont(chatFont);
+}
+
 void ChatView::refreshBlockColors()
 {
     QTextDocument *doc = document();

cockatrice/src/interface/widgets/server/chat_view/chat_view.h

@@ -111,6 +111,7 @@ private slots:
     void openLink(const QUrl &link);
     void actMessageClicked();
     void adjustColorsToPalette();
+    void applyChatFont();
     void refreshBlockColors();
     void onScrollBarRangeChanged();
     void onScrollBarValueChanged(int value);

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

@@ -1,5 +1,6 @@
 #include "tab_report.h"
 
+#include "../interface/theme_manager.h"
 #include "../server/user/user_context_menu.h"
 #include "../utility/report_utils.h"
 #include "abstract_client.h"
@@ -138,13 +139,8 @@ TabReport::TabReport(TabSupervisor *_tabSupervisor, AbstractClient *_client) : T
     chatGroup = new QGroupBox;
     chatLogEdit = new QTextEdit;
     chatLogEdit->setReadOnly(true);
-    QFont monoFont("monospace");
+    applyChatLogFont();
-    monoFont.setStyleHint(QFont::Monospace);
+    connect(themeManager, &ThemeManager::fontsChanged, this, &TabReport::applyChatLogFont);
-    const int systemPointSize = QFontDatabase::systemFont(QFontDatabase::GeneralFont).pointSize();
-    if (systemPointSize > 0) {
-        monoFont.setPointSize(systemPointSize);
-    }
-    chatLogEdit->setFont(monoFont);
     auto *chatLayout = new QVBoxLayout(chatGroup);
     chatLayout->setContentsMargins(4, 4, 4, 4);
     chatLayout->addWidget(chatLogEdit);
@@ -277,6 +273,18 @@ TabReport::TabReport(TabSupervisor *_tabSupervisor, AbstractClient *_client) : T
     refreshList();
 }
 
+void TabReport::applyChatLogFont()
+{
+    // Family comes from the ChatLog theme role; size stays caller-side as before.
+    QFont monoFont = themeManager->appFont(AppFont::ChatLog);
+    monoFont.setStyleHint(QFont::Monospace);
+    const int systemPointSize = QFontDatabase::systemFont(QFontDatabase::GeneralFont).pointSize();
+    if (systemPointSize > 0) {
+        monoFont.setPointSize(systemPointSize);
+    }
+    chatLogEdit->setFont(monoFont);
+}
+
 void TabReport::retranslateUi()
 {
     userContextMenu->retranslateUi();

cockatrice/src/interface/widgets/tabs/tab_report.h

@@ -62,6 +62,7 @@ private slots:
     void statsResponse(const Response &response);
     void reopenReport();
     void reopenResponse(const Response &response);
+    void applyChatLogFont();
 
 private:
     int selectedReportId() const;