X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbutton.h;h=844fe88c30fe786d9c460030f35a87ad11f78a10;hb=HEAD;hp=63159ee2318dcc6cd1ecf81e47d8b22797b2fee9;hpb=50bf1ef2e2c3c38de20f6996a6c5ed0066111177;p=libs%2Fgltk.git

diff --git a/source/button.h b/source/button.h
index 63159ee..22426ca 100644
--- a/source/button.h
+++ b/source/button.h
@@ -1,14 +1,10 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GLTK_BUTTON_H_
 #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 {
@@ -18,31 +14,47 @@ namespace GLtk {
 A clickable button widget.  Buttons can have a text label, which is displayed
 in a spacial part "text".
 */
-class Button: public Widget
+class MSPGLTK_API Button: public Widget
 {
 public:
-	class Loader: public Widget::Loader
+	class MSPGLTK_API Loader: public DataFile::DerivedObjectLoader<Button, Widget::Loader>
 	{
 	public:
 		Loader(Button &);
-		Button &get_object() const;
+
+	private:
+		void text(const std::string &);
 	};
 
+	sigc::signal<void> signal_clicked;
+
 private:
-	std::string text;
-	bool pressed;
+	Text text;
+	const GL::Texture2D *icon = nullptr;
+	bool pressed = false;
 
 public:
-	sigc::signal<void> signal_clicked;
+	Button(const std::string & = std::string());
+
+	const char *get_class() const override { return "button"; }
 
-	Button(const Resources &, const std::string & =std::string());
+private:
+	void autosize_special(const Part &, Geometry &) const override;
+
+public:
 	void set_text(const std::string &);
-	virtual void button_press(int, int, unsigned);
-	virtual void button_release(int, int, unsigned);
-	virtual void pointer_leave();
+	void set_icon(const GL::Texture2D *);
+
+private:
+	void rebuild_special(const Part &) override;
+
+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:
-	virtual const char *get_class() const { return "button"; }
-	virtual void render_special(const Part &) const;
+	void on_style_change() override;
 };
 
 } // namespace GLtk