diff options
author | TheKodeToad <TheKodeToad@proton.me> | 2023-07-01 13:05:55 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-01 13:05:55 +0100 |
commit | 7138425c8581e19d36ee62e1193a5b7184eb0089 (patch) | |
tree | d29efcad3353603c6ac1eb64708a92e616c00ecc /launcher/minecraft/mod/TexturePack.h | |
parent | 05d2c1f0b06519eba9cc5ad22848106b49f9bd15 (diff) | |
parent | c523765c197cf63d6830d205f1554cd73e38109e (diff) | |
download | PrismLauncher-7138425c8581e19d36ee62e1193a5b7184eb0089.tar.gz PrismLauncher-7138425c8581e19d36ee62e1193a5b7184eb0089.tar.bz2 PrismLauncher-7138425c8581e19d36ee62e1193a5b7184eb0089.zip |
Merge branch 'develop' into better-component-installation
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
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; }; |