jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-19 08:52:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixup custom theme image loading

Browse source
This commit is contained in:
ZeldaZach 2025-02-06 01:45:34 -05:00
parent b7438b95d8
commit cad9088937
No known key found for this signature in database
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -18,18 +18,18 @@
/** /**
* 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 path 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.
* *
* @return The svg loaded into a Pixmap with the given size, or an empty Pixmap if the loading failed. * @return The svg loaded into a Pixmap with the given size, or an empty Pixmap if the loading failed.
*/ */
static QPixmap loadSvg(const QString &path, const QSize &size, bool expandOnly = false) static QPixmap loadSvg(const QString &svgPath, const QSize &size, bool expandOnly = false)
{ {
QSvgRenderer svgRenderer(path + ".svg"); QSvgRenderer svgRenderer(svgPath);
if (!svgRenderer.isValid()) { if (!svgRenderer.isValid()) {
qCWarning(PixelMapGeneratorLog) << "Failed to load" << path; qCWarning(PixelMapGeneratorLog) << "Failed to load" << svgPath;
return {}; return {};
} }
@ -53,7 +53,7 @@ static QPixmap loadSvg(const QString &path, const QSize &size, bool expandOnly =
/** /**
* Try to load path image from non-SVG formats, otherwise fall back to SVG. * 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. * 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. File formats will be automatically detected. * @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 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). * @param expandOnly If true, then keep the size of the initial pixmap to at least the size (Only relevant if SVG).
* *
@ -70,7 +70,7 @@ static QPixmap tryLoadImage(const QString &path, const QSize &size, bool expandO
} }
} }
return loadSvg(path, size, expandOnly); return loadSvg(path + ".svg", size, expandOnly);
} }
QMap<QString, QPixmap> PhasePixmapGenerator::pmCache; QMap<QString, QPixmap> PhasePixmapGenerator::pmCache;