X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flist.h;h=5a95b085ae64c9d22837fea608d65af988135578;hb=6762feb95d685b556ae97a9cd1ce964d2b2ee5fe;hp=14d9eac291e3bb2b7daee7c9862a268108689182;hpb=3f77f3542a6405fd832ababe48b950d1a65b00ed;p=libs%2Fgltk.git

diff --git a/source/list.h b/source/list.h
index 14d9eac..5a95b08 100644
--- a/source/list.h
+++ b/source/list.h
@@ -1,6 +1,8 @@
 #ifndef MSP_GLTK_LIST_H_
 #define MSP_GLTK_LIST_H_
 
+#include <stdexcept>
+#include <typeinfo>
 #include <sigc++/signal.h>
 #include "container.h"
 #include "label.h"
@@ -10,6 +12,17 @@
 namespace Msp {
 namespace GLtk {
 
+/**
+Thrown if a list's item type is incompatible with its data.
+*/
+class incompatible_data: public std::logic_error
+{
+public:
+	incompatible_data(const std::type_info &);
+	virtual ~incompatible_data() throw() { }
+};
+
+
 /**
 Shows a list of items, allowing the user to select one.  A slider is included
 to allow scrolling through a long list.
@@ -41,21 +54,31 @@ private:
 		void refresh_item(unsigned);
 	};
 
-protected:
+public:
 	class Item: public Container
 	{
 	public:
 		virtual const char *get_class() const { return "listitem"; }
 
 	protected:
-		virtual void autosize_special(const Part &, Geometry &);
+		virtual void autosize_special(const Part &, Geometry &) const;
 	public:
 		void set_active(bool);
 
 		virtual void render_special(const Part &, GL::Renderer &) const;
 	};
 
-public:
+	class MultiColumnItem: public Item
+	{
+	protected:
+		virtual void check_widths(std::vector<unsigned> &) const;
+		virtual void set_widths(const std::vector<unsigned> &);
+
+	private:
+		virtual void on_style_change();
+	};
+
+private:
 	class BasicItem: public Item
 	{
 	private:
@@ -68,17 +91,58 @@ public:
 		virtual void on_style_change();
 	};
 
+	class ItemFactory
+	{
+	protected:
+		ItemFactory() { }
+	public:
+		virtual ~ItemFactory() { }
+
+		virtual void set_data(const ListData &) = 0;
+		virtual Item *create_item(unsigned) const = 0;
+	};
+
+	template<typename I>
+	class TypedItemFactory: public ItemFactory
+	{
+	private:
+		typedef typename I::ValueType ValueType;
+
+		const ListDataStore<ValueType> *data;
+
+	public:
+		TypedItemFactory(const ListData &d)
+		{ set_data(d); }
+
+		virtual void set_data(const ListData &d)
+		{
+			if(const ListDataStore<ValueType> *ds = dynamic_cast<const ListDataStore<ValueType> *>(&d))
+				data = ds;
+			else
+				throw incompatible_data(typeid(ValueType));
+		}
+
+		virtual Item *create_item(unsigned i) const
+		{
+			return new I(data->get(i));
+		}
+	};
+
 public:
 	sigc::signal<void, unsigned> signal_item_selected;
+	sigc::signal<void> signal_selection_cleared;
 
 private:
 	ListData *data;
 	bool own_data;
 	DataObserver *observer;
+	ItemFactory *item_factory;
 	int sel_index;
+	int focus_index;
 	unsigned first;
 	unsigned max_scroll;
 	unsigned view_size;
+	bool ignore_slider_change;
 
 	VSlider slider;
 	std::vector<Item *> items;
@@ -94,7 +158,7 @@ public:
 	virtual const char *get_class() const { return "list"; }
 
 private:
-	virtual void autosize_special(const Part &, Geometry &);
+	virtual void autosize_special(const Part &, Geometry &) const;
 
 public:
 	void set_data(ListData &);
@@ -102,8 +166,17 @@ public:
 	const ListData &get_data() const { return *data; }
 private:
 	void items_changed();
-protected:
-	virtual Item *create_item(unsigned);
+
+public:
+	template<typename I>
+	void set_item_type()
+	{
+		ItemFactory *f = new TypedItemFactory<I>(*data);
+		delete item_factory;
+		item_factory = f;
+	}
+private:
+	Item *create_item(unsigned);
 
 public:
 	void set_view_size(unsigned);
@@ -113,18 +186,22 @@ public:
 	int get_selected_index() const { return sel_index; }
 
 private:
+	virtual void rebuild_special(const Part &);
 	virtual void render_special(const Part &, GL::Renderer &) const;
 
 public:
 	virtual void button_press(int, int, unsigned);
+	virtual void focus_in();
+	virtual bool navigate(Navigation);
 private:
-	virtual void on_geometry_change();
-	virtual void on_style_change();
+	void set_focus_index(int);
 
-	void reposition_slider();
-	void reposition_items();
+	void item_autosize_changed(Item *);
+	unsigned last_to_first(unsigned) const;
 	void check_view_range();
+	void scroll_to_focus();
 	void slider_value_changed(double);
+	static void adjust_index(int &, int, int);
 };
 
 } // namespace GLtk