X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fimage.h;h=8b857f41c48ec051309584b2f3d629a6dd0f250e;hb=HEAD;hp=5f6b935d20422050df32664b5c00e71984361e61;hpb=2b70e8801c43875ed3f4135bdd0141265cff0312;p=libs%2Fgltk.git

diff --git a/source/image.h b/source/image.h
index 5f6b935..99e0874 100644
--- a/source/image.h
+++ b/source/image.h
@@ -2,6 +2,7 @@
 #define MSP_GLTK_IMAGE_H_
 
 #include <msp/gl/texture2d.h>
+#include "mspgltk_api.h"
 #include "widget.h"
 
 namespace Msp {
@@ -10,24 +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"; }
+	const char *get_class() const override { return "image"; }
 
-	virtual void autosize();
+private:
+	void autosize_special(const Part &, Geometry &) const override;
 
+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();
+	void rebuild_special(const Part &) override;
+	void on_style_change() override;
+	void on_reparent() override;
 };
 
 } // namespace GLtk