diff options
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/icon.cpp | 14 | ||||
| -rw-r--r-- | src/gui/widgets/icon.h | 9 |
2 files changed, 17 insertions, 6 deletions
diff --git a/src/gui/widgets/icon.cpp b/src/gui/widgets/icon.cpp index 5876b1201..6c44cdc3a 100644 --- a/src/gui/widgets/icon.cpp +++ b/src/gui/widgets/icon.cpp @@ -30,9 +30,11 @@ #include "debug.h" Icon::Icon(const Widget2 *const widget, - const std::string &file) : + const std::string &file, + const AutoRelease autoRelease) : Widget(widget), - mImage(resourceManager->getImage(file)) + mImage(resourceManager->getImage(file)), + mAutoRelease(autoRelease) { if (mImage) { @@ -43,9 +45,11 @@ Icon::Icon(const Widget2 *const widget, } Icon::Icon(const Widget2 *const widget, - Image *const image) : + Image *const image, + const AutoRelease autoRelease) : Widget(widget), - mImage(image) + mImage(image), + mAutoRelease(autoRelease) { if (mImage) { @@ -59,6 +63,8 @@ Icon::~Icon() { if (gui) gui->removeDragged(this); + if (mImage && mAutoRelease == AutoRelease_true) + mImage->decRef(); } void Icon::setImage(Image *const image) diff --git a/src/gui/widgets/icon.h b/src/gui/widgets/icon.h index e48f71b24..c54c314ba 100644 --- a/src/gui/widgets/icon.h +++ b/src/gui/widgets/icon.h @@ -25,6 +25,8 @@ #include "gui/widgets/widget.h" +#include "enums/simpletypes/autorelease.h" + #include "localconsts.h" class Image; @@ -41,13 +43,15 @@ class Icon final : public Widget * Constructor. */ Icon(const Widget2 *const widget, - const std::string &filename); + const std::string &filename, + const AutoRelease autoRelease = AutoRelease_false); /** * Constructor, uses an existing Image. */ Icon(const Widget2 *const widget, - Image *const image); + Image *const image, + const AutoRelease autoRelease = AutoRelease_false); A_DELETE_COPY(Icon) @@ -73,6 +77,7 @@ class Icon final : public Widget private: Image *mImage; + AutoRelease mAutoRelease; }; #endif // GUI_WIDGETS_ICON_H |