diff options
author | Trial97 <alexandru.tripon97@gmail.com> | 2023-06-23 11:42:28 +0300 |
---|---|---|
committer | Trial97 <alexandru.tripon97@gmail.com> | 2023-06-23 11:42:28 +0300 |
commit | 6613deca0fa3a49086e89bc05e047f05909f8c0c (patch) | |
tree | ff8407e02d9c3d59a02436a2ad083f241d87cc2e /launcher/minecraft/mod/TexturePack.h | |
parent | 718aca3d066fc24c03b7ac6d625d68829fcaa427 (diff) | |
parent | 8df5ab8aa7ec32ee3c44e2b57dc9c9f04e093d9d (diff) | |
download | PrismLauncher-6613deca0fa3a49086e89bc05e047f05909f8c0c.tar.gz PrismLauncher-6613deca0fa3a49086e89bc05e047f05909f8c0c.tar.bz2 PrismLauncher-6613deca0fa3a49086e89bc05e047f05909f8c0c.zip |
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks
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; }; |