X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdropdown.h;h=2d3feb3ba236e314c4d767af0106a19575ae163e;hb=7286d604956ddffcbfa2df6567de866f3d5df3a2;hp=fd98f11ddfa2d4e1b8940dfb37f1a639f6790d00;hpb=1d84ac50711ce9d23cb1dafd83158d4ffa938a15;p=libs%2Fgltk.git

diff --git a/source/dropdown.h b/source/dropdown.h
index fd98f11..2d3feb3 100644
--- a/source/dropdown.h
+++ b/source/dropdown.h
@@ -3,6 +3,7 @@
 
 #include <sigc++/signal.h>
 #include "list.h"
+#include "text.h"
 #include "widget.h"
 
 namespace Msp {
@@ -13,7 +14,7 @@ class List;
 class Dropdown: virtual public Widget, private Container
 {
 public:
-	class Loader: public Widget::Loader
+	class Loader: public DataFile::DerivedObjectLoader<Dropdown, Widget::Loader>
 	{
 	public:
 		Loader(Dropdown &);
@@ -26,6 +27,7 @@ public:
 private:
 	List list;
 	bool dropped;
+	Text text;
 
 public:
 	Dropdown();
@@ -36,28 +38,37 @@ private:
 public:
 	virtual const char *get_class() const { return "dropdown"; }
 
-	virtual void autosize();
+private:
+	virtual void autosize_special(const Part &, Geometry &) const;
 
+public:
 	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(); }
 
+	template<typename T>
+	void set_item_type() { list.set_item_type<T>(); }
+
 	void set_selected_index(int i) { list.set_selected_index(i); }
 	int get_selected_index() const { return list.get_selected_index(); }
 
 private:
-	virtual void rebuild_special(const Part &, CachedPart &);
+	virtual void rebuild_special(const Part &);
 	virtual void render_special(const Part &, GL::Renderer &) const;
 
 public:
 	virtual void button_press(int, int, unsigned);
+	virtual bool navigate(Navigation);
 private:
-	virtual void on_geometry_change();
+	virtual void on_size_change();
 	virtual void on_style_change();
 
+	void open_list();
+	void close_list();
 	void list_autosize_changed();
 	void resize_list();
 	void list_item_selected(unsigned);
+	void list_selection_cleared();
 };
 
 } // namespace GLtk