X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fimage.h;h=12e77f2a7f6df28f935bcf2c66dac9290913f33f;hb=81c4024fb6acf37df702a803dc4efdf82a81525a;hp=efc814487f88c39f38e2cc209382b5d53db0a50e;hpb=2bdaf4955fdb94e73704adcdcf0adc2b353f0ff0;p=libs%2Fgltk.git

diff --git a/source/image.h b/source/image.h
index efc8144..12e77f2 100644
--- a/source/image.h
+++ b/source/image.h
@@ -1,14 +1,8 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2010-2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GLTK_IMAGE_H_
 #define MSP_GLTK_IMAGE_H_
 
 #include <msp/gl/texture2d.h>
+#include "mspgltk_api.h"
 #include "widget.h"
 
 namespace Msp {
@@ -17,22 +11,38 @@ namespace GLtk {
 /**
 A widget for displaying images.
 */
-class Image: public Widget
+class MSPGLTK_API Image: public Widget
 {
+public:
+	class Loader: public Msp::DataFile::DerivedObjectLoader<Image, Widget::Loader>
+	{
+	public:
+		Loader(Image &);
+	};
+
 private:
-	const GL::Texture2D *image;
-	bool keep_aspect;
+	const GL::Texture2D *image = nullptr;
+	std::string icon_name;
+	bool keep_aspect = true;
 
 public:
-	Image(const GL::Texture2D * = 0);
+	Image(const GL::Texture2D * = nullptr);
 
 	virtual const char *get_class() const { return "image"; }
 
+private:
+	virtual void autosize_special(const Part &, Geometry &) const;
+
+public:
 	void set_image(const GL::Texture2D *);
+	void set_icon(const std::string &);
 	void set_keep_aspect(bool);
 
 private:
-	virtual void render_special(const Part &) const;
+	void update_icon();
+	virtual void rebuild_special(const Part &);
+	virtual void on_style_change();
+	virtual void on_reparent();
 };
 
 } // namespace GLtk