jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-04 04:23:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixup custom theme image loading (#5568)

Browse source
This commit is contained in:
Zach H 2025-02-06 08:40:10 -05:00 • committed by GitHub
parent 9b4f51d1e4
commit 67091fff9c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 31 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

44
cockatrice/src/client/ui/pixel_map_generator.cpp
View file

@ -18,7 +18,7 @@
/** /**
* Loads in an svg from file and scales it without affecting image quality. * 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 svgPath The path to the svg file, with file extension.
* @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. * @param expandOnly If true, then keep the size of the initial pixmap to at least the svg size.
* *
@ -26,15 +26,10 @@
*/ */
static QPixmap loadSvg(const QString &svgPath, const QSize &size, bool expandOnly = false) static QPixmap loadSvg(const QString &svgPath, const QSize &size, bool expandOnly = false)
{ {
QString path = svgPath; QSvgRenderer svgRenderer(svgPath);
if (!path.endsWith(".svg")) {
path += ".svg";
}
QSvgRenderer svgRenderer(path);
if (!svgRenderer.isValid()) { if (!svgRenderer.isValid()) {
qCWarning(PixelMapGeneratorLog) << "Failed to load" << path; qCWarning(PixelMapGeneratorLog) << "Failed to load" << svgPath;
return {}; return {};
} }
@ -55,6 +50,29 @@ static QPixmap loadSvg(const QString &svgPath, const QSize &size, bool expandOnl
return pix; return pix;
} }
/**
* Try to load path image from non-SVG formats, otherwise fall back to SVG.
* This is to allow custom themes to support non-SVG format type overrides, since SVG requires custom loading.
* @param path The path to the file, with no file extension. File formats will be automatically detected.
* @param size The desired size of the pixmap.
* @param expandOnly If true, then keep the size of the initial pixmap to at least the size (Only relevant if SVG).
*
* @return The loaded image into a Pixmap with the given size, or an empty Pixmap if the loading failed.
*/
static QPixmap tryLoadImage(const QString &path, const QSize &size, bool expandOnly = false)
{
const auto formats = {"png", "jpg"};
QPixmap returnPixmap;
for (const auto &format : formats) {
if (returnPixmap.load(path, format)) {
return returnPixmap.scaled(size, Qt::KeepAspectRatio, Qt::SmoothTransformation);
}
}
return loadSvg(path + ".svg", size, expandOnly);
}
QMap<QString, QPixmap> PhasePixmapGenerator::pmCache; QMap<QString, QPixmap> PhasePixmapGenerator::pmCache;
QPixmap PhasePixmapGenerator::generatePixmap(int height, QString name) QPixmap PhasePixmapGenerator::generatePixmap(int height, QString name)
@ -63,7 +81,7 @@ QPixmap PhasePixmapGenerator::generatePixmap(int height, QString name)
if (pmCache.contains(key)) if (pmCache.contains(key))
return pmCache.value(key); return pmCache.value(key);
QPixmap pixmap = loadSvg("theme:phases/" + name, QSize(height, height)); QPixmap pixmap = tryLoadImage("theme:phases/" + name, QSize(height, height));
pmCache.insert(key, pixmap); pmCache.insert(key, pixmap);
return pixmap; return pixmap;
@ -84,14 +102,14 @@ QPixmap CounterPixmapGenerator::generatePixmap(int height, QString name, bool hi
if (pmCache.contains(key)) if (pmCache.contains(key))
return pmCache.value(key); return pmCache.value(key);
QPixmap pixmap = loadSvg("theme:counters/" + name, QSize(height, height)); QPixmap pixmap = tryLoadImage("theme:counters/" + name, QSize(height, height));
// fall back to colorless counter if the name can't be found // fall back to colorless counter if the name can't be found
if (pixmap.isNull()) { if (pixmap.isNull()) {
name = "general"; name = "general";
if (highlight) if (highlight)
name.append("_highlight"); name.append("_highlight");
pixmap = loadSvg("theme:counters/" + name, QSize(height, height)); pixmap = tryLoadImage("theme:counters/" + name, QSize(height, height));
} }
pmCache.insert(key, pixmap); pmCache.insert(key, pixmap);
@ -135,7 +153,7 @@ QPixmap CountryPixmapGenerator::generatePixmap(int height, const QString &countr
return pmCache.value(key); return pmCache.value(key);
int width = height * 2; int width = height * 2;
QPixmap pixmap = loadSvg("theme:countries/" + countryCode.toLower(), QSize(width, height), true); QPixmap pixmap = tryLoadImage("theme:countries/" + countryCode.toLower(), QSize(width, height), true);
QPainter painter(&pixmap); QPainter painter(&pixmap);
painter.setPen(Qt::black); painter.setPen(Qt::black);
@ -332,7 +350,7 @@ QPixmap LockPixmapGenerator::generatePixmap(int height)
if (pmCache.contains(key)) if (pmCache.contains(key))
return pmCache.value(key); return pmCache.value(key);
QPixmap pixmap = loadSvg("theme:icons/lock", QSize(height, height), true); QPixmap pixmap = tryLoadImage("theme:icons/lock", QSize(height, height), true);
pmCache.insert(key, pixmap); pmCache.insert(key, pixmap);
return pixmap; return pixmap;
} }