From 34a04d798ed0b4f4b652082da994c8648e4517e6 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 28 Oct 2015 19:54:36 +0300 Subject: Add support for images in npc skined menu. --- src/gui/widgets/icon.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'src/gui/widgets/icon.cpp') 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) -- cgit v1.2.3-70-g09d2