X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fimage.cpp;h=448da7b985e14664730a1dc33b9994df98bcecbb;hb=103ceeace366c6d80fce323438b31b9bbc167915;hp=383f906911993d2a83d8d434ec791f8c0e90d303;hpb=4b52d16bc895f9d969383d7a7d6a3558c1972cc5;p=libs%2Fgltk.git

diff --git a/source/image.cpp b/source/image.cpp
index 383f906..448da7b 100644
--- a/source/image.cpp
+++ b/source/image.cpp
@@ -1,6 +1,8 @@
 #include <msp/gl/meshbuilder.h>
 #include "image.h"
 #include "part.h"
+#include "resources.h"
+#include "root.h"
 #include "style.h"
 
 using namespace std;
@@ -9,8 +11,7 @@ namespace Msp {
 namespace GLtk {
 
 Image::Image(const GL::Texture2D *i):
-	image(i),
-	keep_aspect(true)
+	image(i)
 {
 }
 
@@ -35,14 +36,37 @@ void Image::autosize_special(const Part &part, Geometry &ageom) const
 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)
+{
+	icon_name = n;
+	update_icon();
 }
 
 void Image::set_keep_aspect(bool ka)
 {
 	keep_aspect = ka;
-	rebuild();
+	mark_rebuild();
+}
+
+void Image::update_icon()
+{
+	image = nullptr;
+	if(!style)
+		return;
+
+	Root *root = find_ancestor<Root>();
+	if(!root)
+		return;
+
+	if(!icon_name.empty())
+		image = &root->get_resources().get<GL::Texture2D>(icon_name);
+	signal_autosize_changed.emit();
+	mark_rebuild();
 }
 
 void Image::rebuild_special(const Part &part)
@@ -88,5 +112,24 @@ void Image::rebuild_special(const Part &part)
 	}
 }
 
+void Image::on_style_change()
+{
+	if(!icon_name.empty())
+		update_icon();
+}
+
+void Image::on_reparent()
+{
+	if(!icon_name.empty())
+		update_icon();
+}
+
+
+Image::Loader::Loader(Image &img):
+	DataFile::DerivedObjectLoader<Image, Widget::Loader>(img)
+{
+	add("icon", &Image::icon_name);
+}
+
 } // namespace GLtk
 } // namespace Msp