X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fimage.cpp;h=655ecc252d2b81aa3187195e6d662611835e283a;hb=81c4024fb6acf37df702a803dc4efdf82a81525a;hp=0102a47e487ea8bf4a9efdf29cf1696172820b8f;hpb=8f888fddb056e4af2437a8996b8294112509bc31;p=libs%2Fgltk.git

diff --git a/source/image.cpp b/source/image.cpp
index 0102a47..655ecc2 100644
--- a/source/image.cpp
+++ b/source/image.cpp
@@ -11,8 +11,7 @@ namespace Msp {
 namespace GLtk {
 
 Image::Image(const GL::Texture2D *i):
-	image(i),
-	keep_aspect(true)
+	image(i)
 {
 }
 
@@ -39,7 +38,7 @@ void Image::set_image(const GL::Texture2D *i)
 	image = i;
 	icon_name = string();
 	signal_autosize_changed.emit();
-	rebuild();
+	mark_rebuild();
 }
 
 void Image::set_icon(const string &n)
@@ -51,7 +50,7 @@ void Image::set_icon(const string &n)
 void Image::set_keep_aspect(bool ka)
 {
 	keep_aspect = ka;
-	rebuild();
+	mark_rebuild();
 }
 
 void Image::update_icon()
@@ -62,16 +61,16 @@ void Image::update_icon()
 		if(root)
 		{
 			if(icon_name.empty())
-				image = 0;
+				image = nullptr;
 			else
 				image = &root->get_resources().get<GL::Texture2D>(icon_name);
 			signal_autosize_changed.emit();
-			rebuild();
+			mark_rebuild();
 			return;
 		}
 	}
 
-	image = 0;
+	image = nullptr;
 }
 
 void Image::rebuild_special(const Part &part)
@@ -129,5 +128,12 @@ void Image::on_reparent()
 		update_icon();
 }
 
+
+Image::Loader::Loader(Image &img):
+	DataFile::DerivedObjectLoader<Image, Widget::Loader>(img)
+{
+	add("icon", &Image::icon_name);
+}
+
 } // namespace GLtk
 } // namespace Msp