X-Git-Url: http://git.tdb.fi/?p=libs%2Fgltk.git;a=blobdiff_plain;f=source%2Flist.h;h=dd44f3b57738e9bd2dbf19cfc87592d0d9bf6b67;hp=2970bb454b19425a5a3626de1c025facd8ccebc3;hb=c8291177b545ec81930603a5915234a60296db51;hpb=1aa6cd9b865e366737dcc9d2d36c4f8faed5bc4f

diff --git a/source/list.h b/source/list.h
index 2970bb4..dd44f3b 100644
--- a/source/list.h
+++ b/source/list.h
@@ -3,6 +3,8 @@
 
 #include <sigc++/signal.h>
 #include "container.h"
+#include "label.h"
+#include "listdata.h"
 #include "vslider.h"
 
 namespace Msp {
@@ -15,7 +17,7 @@ to allow scrolling through a long list.
 class List: virtual public Widget, private Container
 {
 public:
-	class Loader: public Widget::Loader
+	class Loader: public DataFile::DerivedObjectLoader<List, Widget::Loader>
 	{
 	public:
 		Loader(List &);
@@ -23,44 +25,91 @@ public:
 		void item(const std::string &);
 	};
 
-	sigc::signal<void, unsigned, const std::string &> signal_item_selected;
+private:
+	/// This exists to make disconnecting signals easier
+	class DataObserver: public sigc::trackable
+	{
+	private:
+		List &list;
+
+	public:
+		DataObserver(List &);
+
+		void item_added(unsigned);
+		void item_removed(unsigned);
+		void cleared();
+		void refresh_strings();
+	};
+
+protected:
+	class Item: public Container
+	{
+	public:
+		virtual const char *get_class() const { return "listitem"; }
+
+		virtual void autosize();
+		void set_active(bool);
+
+		virtual void render_special(const Part &, GL::Renderer &) const;
+	};
+
+public:
+	class BasicItem: public Item
+	{
+	private:
+		Label label;
+
+	public:
+		BasicItem(const std::string &);
+
+	private:
+		virtual void on_style_change();
+	};
+
+public:
+	sigc::signal<void, unsigned> signal_item_selected;
 
 private:
-	std::vector<std::string> items;
+	ListData *data;
+	bool own_data;
+	DataObserver *observer;
 	int sel_index;
 	unsigned first;
-	unsigned n_visible;
-	unsigned row_height;
-
-	const Part *items_part;
+	unsigned max_scroll;
+	unsigned view_size;
 
 	VSlider slider;
+	std::vector<Item *> items;
 
 public:
 	List();
+	List(ListData &);
+private:
+	void init();
+public:
+	virtual ~List();
 
 	virtual const char *get_class() const { return "list"; }
 
 	virtual void autosize();
-	void autosize_rows(unsigned);
-	void autosize_all();
 
-	void append(const std::string &);
-	void insert(unsigned, const std::string &);
-	void remove(unsigned);
-	void clear();
+	void set_data(ListData &);
+	ListData &get_data() { return *data; }
+	const ListData &get_data() const { return *data; }
 private:
 	void items_changed();
+protected:
+	virtual Item *create_item(unsigned);
+
 public:
-	unsigned get_n_items() const { return items.size(); }
+	void set_view_size(unsigned);
+	void set_view_all();
 
 	void set_selected_index(int);
-	const std::string &get_selected() const;
 	int get_selected_index() const { return sel_index; }
 
 private:
-	virtual void rebuild_special(const Part &, CachedPart &);
-	virtual void render_special(const Part &) const;
+	virtual void render_special(const Part &, GL::Renderer &) const;
 
 public:
 	virtual void button_press(int, int, unsigned);
@@ -69,6 +118,7 @@ private:
 	virtual void on_style_change();
 
 	void reposition_slider();
+	void reposition_items();
 	void check_view_range();
 	void slider_value_changed(double);
 };