From 218ed726b6bd5c24fb417a55fb7779fcd6e1fde6 Mon Sep 17 00:00:00 2001
From: RickyRister <42636155+RickyRister@users.noreply.github.com>
Date: Tue, 4 Feb 2025 14:22:05 -0800
Subject: [PATCH] Fix wrong position and scaling of svg pixmaps when zoomed out
 (#5563)

* fix scaling for player icon profile pic

* fix scaling for other svgs
---
 .../src/client/ui/pixel_map_generator.cpp     | 20 +++++++++++------
 cockatrice/src/game/player/player_target.cpp  | 22 ++++++++++++-------
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/cockatrice/src/client/ui/pixel_map_generator.cpp b/cockatrice/src/client/ui/pixel_map_generator.cpp
index 2efbadd53..8cf2b3298 100644
--- a/cockatrice/src/client/ui/pixel_map_generator.cpp
+++ b/cockatrice/src/client/ui/pixel_map_generator.cpp
@@ -19,11 +19,12 @@
  * Loads in an svg from file and scales it without affecting image quality.
  *
  * @param svgPath The path to the svg file. Automatically appends ".svg" to the end if not present
- * @param size The desired size of the pixmap
+ * @param size The desired size of the pixmap.
+ * @param expandOnly If true, then keep the size of the initial pixmap to at least the svg size.
  *
  * @return The svg loaded into a Pixmap with the given size, or an empty Pixmap if the loading failed.
  */
-static QPixmap loadSvg(const QString &svgPath, const QSize &size)
+static QPixmap loadSvg(const QString &svgPath, const QSize &size, bool expandOnly = false)
 {
     QString path = svgPath;
     if (!path.endsWith(".svg")) {
@@ -37,16 +38,21 @@ static QPixmap loadSvg(const QString &svgPath, const QSize &size)
         return {};
     }
 
-    // Makes sure the pixmap is at least as large as the svg, so that we don't lose any detail.
+    // If expandOnly, make sure the pixmap is at least as large as the svg, so that we don't lose any detail.
     // QIcon.pixmap(size) will automatically scale down the image, but it won't scale it up.
-    QPixmap pix(svgRenderer.defaultSize().expandedTo(size));
+    QSize pixmapSize = expandOnly ? svgRenderer.defaultSize().expandedTo(size) : size;
+    QPixmap pix(pixmapSize);
     pix.fill(Qt::transparent);
 
     QPainter pixPainter(&pix);
     svgRenderer.render(&pixPainter);
 
     // Converting the pixmap to a QIcon and back is the easiest way to scale down a svg without affecting image quality
-    return QIcon(pix).pixmap(size);
+    if (expandOnly) {
+        return QIcon(pix).pixmap(size);
+    }
+
+    return pix;
 }
 
 QMap<QString, QPixmap> PhasePixmapGenerator::pmCache;
@@ -129,7 +135,7 @@ QPixmap CountryPixmapGenerator::generatePixmap(int height, const QString &countr
         return pmCache.value(key);
 
     int width = height * 2;
-    QPixmap pixmap = loadSvg("theme:countries/" + countryCode.toLower(), QSize(width, height));
+    QPixmap pixmap = loadSvg("theme:countries/" + countryCode.toLower(), QSize(width, height), true);
 
     QPainter painter(&pixmap);
     painter.setPen(Qt::black);
@@ -321,7 +327,7 @@ QPixmap LockPixmapGenerator::generatePixmap(int height)
     if (pmCache.contains(key))
         return pmCache.value(key);
 
-    QPixmap pixmap = loadSvg("theme:icons/lock", QSize(height, height));
+    QPixmap pixmap = loadSvg("theme:icons/lock", QSize(height, height), true);
     pmCache.insert(key, pixmap);
     return pixmap;
 }
diff --git a/cockatrice/src/game/player/player_target.cpp b/cockatrice/src/game/player/player_target.cpp
index ba1c3d52d..29bc3ddf8 100644
--- a/cockatrice/src/game/player/player_target.cpp
+++ b/cockatrice/src/game/player/player_target.cpp
@@ -88,6 +88,7 @@ void PlayerTarget::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*o
     const QString cacheKey = "avatar" + QString::number(translatedSize.width()) + "_" +
                              QString::number(info->user_level()) + "_" + QString::number(fullPixmap.cacheKey());
     if (!QPixmapCache::find(cacheKey, &cachedPixmap)) {
+        qDebug() << "TRACK cache miss" << cacheKey;
         cachedPixmap = QPixmap(translatedSize.width(), translatedSize.height());
 
         QPainter tempPainter(&cachedPixmap);
@@ -101,16 +102,21 @@ void PlayerTarget::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*o
         grad.setColorAt(0, QColor(180, 180, 180));
         tempPainter.fillRect(QRectF(0, 0, translatedSize.width(), translatedSize.height()), grad);
 
-        QPixmap tempPixmap;
-        if (fullPixmap.isNull())
-            tempPixmap = UserLevelPixmapGenerator::generatePixmap(
-                translatedSize.height(), UserLevelFlags(info->user_level()), info->pawn_colors(), false,
+        if (fullPixmap.isNull()) {
+            int sideLength = translatedSize.height();
+            QPixmap tempPixmap = UserLevelPixmapGenerator::generatePixmap(
+                sideLength, UserLevelFlags(info->user_level()), info->pawn_colors(), false,
                 QString::fromStdString(info->privlevel()));
-        else
-            tempPixmap = fullPixmap.scaled(translatedSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+            int x = (translatedSize.width() - sideLength) / 2;
+            int y = 0;
+            tempPainter.drawPixmap(x, y, tempPixmap);
+        } else {
+            QPixmap tempPixmap = fullPixmap.scaled(translatedSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+            int x = (translatedSize.width() - tempPixmap.width()) / 2;
+            int y = (translatedSize.height() - tempPixmap.height()) / 2;
+            tempPainter.drawPixmap(x, y, tempPixmap);
+        }
 
-        tempPainter.drawPixmap((translatedSize.width() - tempPixmap.width()) / 2,
-                               (translatedSize.height() - tempPixmap.height()) / 2, tempPixmap);
         QPixmapCache::insert(cacheKey, cachedPixmap);
     }