X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdropdown.h;h=3a42d007755a38c6478fc46fbd032224df7e4a0b;hb=103ceeace366c6d80fce323438b31b9bbc167915;hp=49088e20f2dc8e01e6567f7b6eb69618f1febc0a;hpb=50bf1ef2e2c3c38de20f6996a6c5ed0066111177;p=libs%2Fgltk.git

diff --git a/source/dropdown.h b/source/dropdown.h
index 49088e2..3a42d00 100644
--- a/source/dropdown.h
+++ b/source/dropdown.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_DROPDOWN_H_
 #define MSP_GLTK_DROPDOWN_H_
 
 #include <sigc++/signal.h>
+#include "list.h"
+#include "mspgltk_api.h"
+#include "text.h"
 #include "widget.h"
 
 namespace Msp {
@@ -16,10 +12,10 @@ namespace GLtk {
 
 class List;
 
-class Dropdown: public Widget
+class MSPGLTK_API Dropdown: virtual public Widget, private Container
 {
 public:
-	class Loader: public Widget::Loader
+	class MSPGLTK_API Loader: public DataFile::DerivedObjectLoader<Dropdown, Widget::Loader>
 	{
 	public:
 		Loader(Dropdown &);
@@ -27,30 +23,53 @@ public:
 		void item(const std::string &);
 	};
 
+	sigc::signal<void, std::size_t> signal_item_selected;
+
+private:
+	List list;
+	bool dropped = false;
+	Text text;
+
+public:
+	Dropdown();
+	Dropdown(ListData &);
+private:
+	void init();
+
+public:
+	const char *get_class() const override { return "dropdown"; }
+
 private:
-	List *list;
-	std::string text;
-	bool dropped;
-	bool list_active;
+	void autosize_special(const Part &, Geometry &) const override;
 
 public:
-	sigc::signal<void, int, const std::string &> signal_item_selected;
+	void set_data(ListData &d) { list.set_data(d); }
+	ListData &get_data() { return list.get_data(); }
+	const ListData &get_data() const { return list.get_data(); }
 
-	Dropdown(const Resources &);
-	~Dropdown();
+	template<typename T>
+	void set_item_type() { list.set_item_type<T>(); }
 
-	void append(const std::string &);
+	void set_selected_index(int i) { list.set_selected_index(i); }
+	int get_selected_index() const { return list.get_selected_index(); }
 
-	virtual void button_press(int, int, unsigned);
-	virtual void button_release(int, int, unsigned);
-	virtual void pointer_motion(int, int);
 private:
-	virtual const char *get_class() const { return "dropdown"; }
-	virtual void render_special(const Part &) const;
+	void rebuild_special(const Part &) override;
+	void render_special(const Part &, GL::Renderer &) const override;
 
-	virtual void on_geometry_change();
+public:
+	void button_press(int, int, unsigned) override;
+	bool navigate(Navigation) override;
+private:
+	void on_size_change() override;
+	void on_style_change() override;
 
-	void list_item_selected(unsigned, const std::string &);
+	void open_list();
+	void close_list();
+	void list_autosize_changed();
+	void resize_list();
+	void list_item_selected(std::size_t);
+	void list_selection_cleared();
 };
 
 } // namespace GLtk