X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbutton.h;h=22426ca5399f6ba9c6f69c866150247f9e584d7a;hb=b59fab7e533ef96d72c92b224d4f24718bc6b0a1;hp=407e2f950bfb04424796aaf312f11c9c4a98e553;hpb=c1f038acb91eb3bfaa34dfd4729d19ed3f871a42;p=libs%2Fgltk.git

diff --git a/source/button.h b/source/button.h
index 407e2f9..22426ca 100644
--- a/source/button.h
+++ b/source/button.h
@@ -2,26 +2,59 @@
 #define MSP_GLTK_BUTTON_H_
 
 #include <sigc++/sigc++.h>
+#include <msp/gl/texture2d.h>
+#include "mspgltk_api.h"
+#include "text.h"
 #include "widget.h"
 
 namespace Msp {
 namespace GLtk {
 
-class Button: public Widget
+/**
+A clickable button widget.  Buttons can have a text label, which is displayed
+in a spacial part "text".
+*/
+class MSPGLTK_API Button: public Widget
 {
 public:
+	class MSPGLTK_API Loader: public DataFile::DerivedObjectLoader<Button, Widget::Loader>
+	{
+	public:
+		Loader(Button &);
+
+	private:
+		void text(const std::string &);
+	};
+
 	sigc::signal<void> signal_clicked;
 
-	Button(const Resources &, const std::string & =std::string());
+private:
+	Text text;
+	const GL::Texture2D *icon = nullptr;
+	bool pressed = false;
+
+public:
+	Button(const std::string & = std::string());
+
+	const char *get_class() const override { return "button"; }
+
+private:
+	void autosize_special(const Part &, Geometry &) const override;
+
+public:
 	void set_text(const std::string &);
+	void set_icon(const GL::Texture2D *);
+
 private:
-	std::string text;
-	bool pressed;
+	void rebuild_special(const Part &) override;
 
-	const char *get_class() const { return "button"; }
-	void render_part(const Part &) const;
-	void on_button_press(int, int, unsigned);
-	void on_button_release(int, int, unsigned);
+public:
+	void button_press(int, int, unsigned) override;
+	void button_release(int, int, unsigned) override;
+	void pointer_motion(int, int) override;
+	bool navigate(Navigation) override;
+private:
+	void on_style_change() override;
 };
 
 } // namespace GLtk