From 2dcf1f2c69270d9de33d6dc3525b1e035c9a7d65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= <Bruebach.Lukas@bdosecurity.de>
Date: Sun, 1 Nov 2026 18:19:37 +0100
Subject: [PATCH] [Game] Follow the palette in judge message tags

Judge tags hardcoded a black prefix and a `theme:icons/scales` image inside rich
text, where `currentColor` cannot resolve and a palette change leaves the tag
unreadable. Render the scales glyph through the themed icon engine, register it
as a document image resource, and repaint the log when the palette or theme
changes.
---
 .../game_graphics/log/message_log_widget.cpp  | 32 +++++++++++++++++--
 .../game_graphics/log/message_log_widget.h    |  2 ++
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/cockatrice/src/game_graphics/log/message_log_widget.cpp b/cockatrice/src/game_graphics/log/message_log_widget.cpp
index 046a1ae90..1a5e58682 100644
--- a/cockatrice/src/game_graphics/log/message_log_widget.cpp
+++ b/cockatrice/src/game_graphics/log/message_log_widget.cpp
@@ -4,6 +4,8 @@
 #include "../../client/settings/card_counter_settings.h"
 #include "../../client/sound_engine.h"
 #include "../../interface/card_localization.h"
+#include "../../interface/theme_icon.h"
+#include "../../interface/theme_manager.h"
 #include "../../interface/widgets/server/chat_view/chat_view.h"
 #include "../board/card_item.h"
 #include "../board/translate_counter_name.h"
@@ -12,8 +14,12 @@
 #include <QColor>
 #include <QDebug>
 #include <QList>
+#include <QPalette>
+#include <QPixmap>
 #include <QSharedPointer>
 #include <QStringList>
+#include <QTextDocument>
+#include <QUrl>
 #include <libcockatrice/game/abstract_game.h>
 #include <libcockatrice/game/board/card_list.h>
 #include <libcockatrice/game/game_state.h>
@@ -120,6 +126,7 @@ MessageLogWidget::getFromStr(CardZoneLogic *zone, QString cardName, int position
 void MessageLogWidget::containerProcessingDone()
 {
     currentContext = MessageContext_None;
+    contextJudgeName.clear();
     messageSuffix = messagePrefix = QString();
 }
 
@@ -841,8 +848,27 @@ void MessageLogWidget::logUndoDrawFailed(PlayerLogic *player)
 
 void MessageLogWidget::setContextJudgeName(QString name)
 {
-    messagePrefix = QString("<span style=\"color:black\">");
-    messageSuffix = QString("</span> [<img height=12 src=\"theme:icons/scales\"> %1]").arg(sanitizeHtml(name));
+    contextJudgeName = std::move(name);
+    refreshJudgeSuffix();
+}
+
+void MessageLogWidget::refreshJudgeSuffix()
+{
+    const QPixmap pixmap = loadThemedIcon(QStringLiteral("icons/scales")).pixmap(QSize(24, 24));
+    if (!pixmap.isNull()) {
+        // Rich text cannot resolve `currentColor`; register a palette-rendered
+        // image so already-appended judge tags repaint on a theme switch.
+        document()->addResource(QTextDocument::ImageResource, QUrl(QStringLiteral("cockatrice:scales")), pixmap);
+        document()->markContentsDirty(0, document()->characterCount());
+    }
+
+    if (contextJudgeName.isEmpty()) {
+        return;
+    }
+
+    messagePrefix = QStringLiteral("<span style=\"color:%1\">").arg(palette().color(QPalette::WindowText).name());
+    messageSuffix =
+        QStringLiteral("</span> [<img height=12 src=\"cockatrice:scales\"> %1]").arg(sanitizeHtml(contextJudgeName));
 }
 
 void MessageLogWidget::appendHtmlServerMessage(const QString &html, bool optionalIsBold, QString optionalFontColor)
@@ -891,4 +917,6 @@ void MessageLogWidget::connectToPlayerEventHandler(PlayerEventHandler *playerEve
 MessageLogWidget::MessageLogWidget(TabSupervisor *_tabSupervisor, AbstractGame *_game, QWidget *parent)
     : ChatView(_tabSupervisor, _game, true, parent), currentContext(MessageContext_None)
 {
+    connect(themeManager, &ThemeManager::paletteChanged, this, &MessageLogWidget::refreshJudgeSuffix);
+    connect(themeManager, &ThemeManager::themeChanged, this, &MessageLogWidget::refreshJudgeSuffix);
 }
diff --git a/cockatrice/src/game_graphics/log/message_log_widget.h b/cockatrice/src/game_graphics/log/message_log_widget.h
index 5642a76e9..da4fbd4e1 100644
--- a/cockatrice/src/game_graphics/log/message_log_widget.h
+++ b/cockatrice/src/game_graphics/log/message_log_widget.h
@@ -39,8 +39,10 @@ private:
 
     MessageContext currentContext;
     QString messagePrefix, messageSuffix;
+    QString contextJudgeName;
 
     static QPair<QString, QString> getFromStr(CardZoneLogic *zone, QString cardName, int position, bool ownerChange);
+    void refreshJudgeSuffix();
 
 public:
     void connectToPlayerEventHandler(PlayerEventHandler *player);