X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdropdown.h;h=c5b535d599bcaae434bb29f0fd53f06f0334890f;hb=d10d1de6d17c285c63d7b3cea549017aaa1ddb01;hp=51ba72434956d1c1728f1a6e021c73dfec73ad18;hpb=2bdaf4955fdb94e73704adcdcf0adc2b353f0ff0;p=libs%2Fgltk.git

diff --git a/source/dropdown.h b/source/dropdown.h
index 51ba724..c5b535d 100644
--- a/source/dropdown.h
+++ b/source/dropdown.h
@@ -1,15 +1,10 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007-2011  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 {
@@ -17,10 +12,10 @@ namespace GLtk {
 
 class List;
 
-class Dropdown: virtual public Widget, private Container
+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 &);
@@ -28,38 +23,53 @@ public:
 		void item(const std::string &);
 	};
 
-	sigc::signal<void, int, const std::string &> signal_item_selected;
+	sigc::signal<void, unsigned> signal_item_selected;
 
 private:
 	List list;
-	bool dropped;
+	bool dropped = false;
+	Text text;
 
 public:
 	Dropdown();
+	Dropdown(ListData &);
+private:
+	void init();
+
+public:
+	const char *get_class() const override { return "dropdown"; }
+
+private:
+	void autosize_special(const Part &, Geometry &) const override;
 
-	virtual const char *get_class() const { return "dropdown"; }
+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(); }
 
-	void append(const std::string &);
-	void insert(unsigned, const std::string &);
-	void remove(unsigned);
-	void clear();
-	unsigned get_n_items() const;
+	template<typename T>
+	void set_item_type() { list.set_item_type<T>(); }
 
-	void set_selected_index(int);
-	const std::string &get_selected() const;
-	int get_selected_index() const;
+	void set_selected_index(int i) { list.set_selected_index(i); }
+	int get_selected_index() const { return list.get_selected_index(); }
 
 private:
-	virtual void render_special(const Part &) const;
+	void rebuild_special(const Part &) override;
+	void render_special(const Part &, GL::Renderer &) const override;
 
 public:
-	virtual void button_press(int, int, unsigned);
+	void button_press(int, int, unsigned) override;
+	bool navigate(Navigation) override;
 private:
-	virtual void on_geometry_change();
-	virtual void on_style_change();
+	void on_size_change() override;
+	void on_style_change() override;
 
+	void open_list();
+	void close_list();
+	void list_autosize_changed();
 	void resize_list();
-	void list_item_selected(unsigned, const std::string &);
+	void list_item_selected(unsigned);
+	void list_selection_cleared();
 };
 
 } // namespace GLtk