aboutsummaryrefslogtreecommitdiff
path: root/launcher/minecraft/mod/TexturePack.h
diff options
context:
space:
mode:
authorTrial97 <alexandru.tripon97@gmail.com>2023-06-23 14:38:30 +0300
committerTrial97 <alexandru.tripon97@gmail.com>2023-06-23 14:38:30 +0300
commit85bbab0e9284e35b0fec26405537c9160496974f (patch)
treefcbceeb50d29cde8f5378246aceebea33b60bcc1 /launcher/minecraft/mod/TexturePack.h
parent67db141203864123f65d93723e7eed43328b8d97 (diff)
parent8df5ab8aa7ec32ee3c44e2b57dc9c9f04e093d9d (diff)
downloadPrismLauncher-85bbab0e9284e35b0fec26405537c9160496974f.tar.gz
PrismLauncher-85bbab0e9284e35b0fec26405537c9160496974f.tar.bz2
PrismLauncher-85bbab0e9284e35b0fec26405537c9160496974f.zip
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into net_job_crash
Diffstat (limited to 'launcher/minecraft/mod/TexturePack.h')
-rw-r--r--launcher/minecraft/mod/TexturePack.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/launcher/minecraft/mod/TexturePack.h b/launcher/minecraft/mod/TexturePack.h
index 81bd5c69..57700565 100644
--- a/launcher/minecraft/mod/TexturePack.h
+++ b/launcher/minecraft/mod/TexturePack.h
@@ -40,13 +40,13 @@ class TexturePack : public Resource {
[[nodiscard]] QString description() const { return m_description; }
/** Gets the image of the texture pack, converted to a QPixmap for drawing, and scaled to size. */
- [[nodiscard]] QPixmap image(QSize size);
+ [[nodiscard]] QPixmap image(QSize size, Qt::AspectRatioMode mode = Qt::AspectRatioMode::IgnoreAspectRatio) const;
/** Thread-safe. */
void setDescription(QString new_description);
/** Thread-safe. */
- void setImage(QImage new_image);
+ void setImage(QImage new_image) const;
bool valid() const override;
@@ -65,5 +65,5 @@ class TexturePack : public Resource {
struct {
QPixmapCache::Key key;
bool was_ever_used = false;
- } m_pack_image_cache_key;
+ } mutable m_pack_image_cache_key;
};