diff options
author | Trial97 <alexandru.tripon97@gmail.com> | 2023-06-23 20:01:17 +0300 |
---|---|---|
committer | Trial97 <alexandru.tripon97@gmail.com> | 2023-06-23 20:01:17 +0300 |
commit | 69c709b05a90f342cc9d1f9337457bb5519a87a9 (patch) | |
tree | 4ff1cbe8123b627bfb171c119b3adc4e2ddaf89b /launcher/minecraft/mod/TexturePack.h | |
parent | 3e3be9ae6f902cc292ee26e4d330b078ddbb2a46 (diff) | |
parent | 046d510134a0061c0a1fa89fda80355c9e2f11ff (diff) | |
download | PrismLauncher-69c709b05a90f342cc9d1f9337457bb5519a87a9.tar.gz PrismLauncher-69c709b05a90f342cc9d1f9337457bb5519a87a9.tar.bz2 PrismLauncher-69c709b05a90f342cc9d1f9337457bb5519a87a9.zip |
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
Diffstat (limited to 'launcher/minecraft/mod/TexturePack.h')
-rw-r--r-- | launcher/minecraft/mod/TexturePack.h | 6 |
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; }; |