X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flist.h;h=060fb813f405cc9b29fb762c8a5ac93e7feedc61;hb=d10d1de6d17c285c63d7b3cea549017aaa1ddb01;hp=ef4311e0702c73b818a19ab3abaadb07e1427abb;hpb=7e328215742ee672b1a93e5f5f358828c53ce921;p=libs%2Fgltk.git

diff --git a/source/list.h b/source/list.h
index ef4311e..060fb81 100644
--- a/source/list.h
+++ b/source/list.h
@@ -7,7 +7,8 @@
 #include "container.h"
 #include "label.h"
 #include "listdata.h"
-#include "vslider.h"
+#include "mspgltk_api.h"
+#include "slider.h"
 
 namespace Msp {
 namespace GLtk {
@@ -15,11 +16,10 @@ namespace GLtk {
 /**
 Thrown if a list's item type is incompatible with its data.
 */
-class incompatible_data: public std::logic_error
+class MSPGLTK_API incompatible_data: public std::logic_error
 {
 public:
 	incompatible_data(const std::type_info &);
-	virtual ~incompatible_data() throw() { }
 };
 
 
@@ -27,9 +27,15 @@ public:
 Shows a list of items, allowing the user to select one.  A slider is included
 to allow scrolling through a long list.
 */
-class List: virtual public Widget, private Container
+class MSPGLTK_API List: virtual public Widget, private Container
 {
 public:
+	enum ViewMode
+	{
+		LIST,
+		GRID
+	};
+
 	class Loader: public DataFile::DerivedObjectLoader<List, Widget::Loader>
 	{
 	public:
@@ -55,33 +61,39 @@ private:
 	};
 
 public:
-	class Item: public Container
+	class Item: virtual public Widget, protected Container
 	{
+	protected:
+		Item();
+
 	public:
-		virtual const char *get_class() const { return "listitem"; }
+		const char *get_class() const override { return "listitem"; }
 
 	protected:
-		virtual void autosize_special(const Part &, Geometry &) const;
+		void autosize_special(const Part &, Geometry &) const override;
 	public:
 		void set_active(bool);
 
-		virtual void render_special(const Part &, GL::Renderer &) const;
+		void render_special(const Part &, GL::Renderer &) const override;
 	};
 
 	class SimpleItem: public Item
 	{
-	private:
-		virtual void on_style_change();
+	protected:
+		SimpleItem() = default;
+
+		void on_style_change() override;
 	};
 
 	class MultiColumnItem: public Item
 	{
 	protected:
+		MultiColumnItem() = default;
+
 		virtual void check_widths(std::vector<unsigned> &) const;
 		virtual void set_widths(const std::vector<unsigned> &);
 
-	private:
-		virtual void on_style_change();
+		void on_style_change() override;
 	};
 
 private:
@@ -97,9 +109,9 @@ private:
 	class ItemFactory
 	{
 	protected:
-		ItemFactory() { }
+		ItemFactory() = default;
 	public:
-		virtual ~ItemFactory() { }
+		virtual ~ItemFactory() = default;
 
 		virtual void set_data(const ListData &) = 0;
 		virtual Item *create_item(unsigned) const = 0;
@@ -117,7 +129,7 @@ private:
 		TypedItemFactory(const ListData &d)
 		{ set_data(d); }
 
-		virtual void set_data(const ListData &d)
+		void set_data(const ListData &d) override
 		{
 			if(const ListDataStore<ValueType> *ds = dynamic_cast<const ListDataStore<ValueType> *>(&d))
 				data = ds;
@@ -125,7 +137,7 @@ private:
 				throw incompatible_data(typeid(ValueType));
 		}
 
-		virtual Item *create_item(unsigned i) const
+		Item *create_item(unsigned i) const override
 		{
 			return new I(data->get(i));
 		}
@@ -144,20 +156,22 @@ public:
 	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_row;
-	unsigned max_scroll;
-	unsigned view_rows;
-	const Part *items_part;
-	bool ignore_slider_change;
-	bool dragging;
-	int drag_start_x;
-	int drag_start_y;
+	ListData *data = nullptr;
+	bool own_data = false;
+	DataObserver *observer = nullptr;
+	ItemFactory *item_factory = nullptr;
+	ViewMode view_mode = LIST;
+	int sel_index = -1;
+	int focus_index = -1;
+	unsigned first_row = 0;
+	unsigned max_scroll = 0;
+	unsigned view_rows = 5;
+	unsigned view_columns = 5;
+	const Part *items_part = nullptr;
+	bool ignore_slider_change = false;
+	bool dragging = false;
+	int drag_start_x = 0;
+	int drag_start_y = 0;
 
 	VSlider slider;
 	std::vector<Item *> items;
@@ -166,15 +180,12 @@ private:
 public:
 	List();
 	List(ListData &);
-private:
-	void init();
-public:
 	virtual ~List();
 
-	virtual const char *get_class() const { return "list"; }
+	const char *get_class() const override { return "list"; }
 
 private:
-	virtual void autosize_special(const Part &, Geometry &) const;
+	void autosize_special(const Part &, Geometry &) const override;
 
 public:
 	void set_data(ListData &);
@@ -195,7 +206,9 @@ private:
 	Item *create_item(unsigned);
 
 public:
+	void set_view_mode(ViewMode);
 	void set_view_size(unsigned);
+	void set_view_size(unsigned, unsigned);
 	void set_view_all();
 
 	void set_selected_index(int);
@@ -203,19 +216,19 @@ public:
 private:
 	void set_selected_item(Widget *);
 
-	virtual void rebuild_special(const Part &);
-	virtual void render_special(const Part &, GL::Renderer &) const;
+	void rebuild_special(const Part &) override;
+	void render_special(const Part &, GL::Renderer &) const override;
 
 public:
-	virtual bool key_press(unsigned, unsigned);
-	virtual void button_press(int, int, unsigned);
-	virtual void touch_press(int, int, unsigned);
-	virtual void touch_release(int, int, unsigned);
-	virtual void touch_motion(int, int, unsigned);
-	virtual void focus_in();
-	virtual bool navigate(Navigation);
+	bool key_press(unsigned, unsigned) override;
+	void button_press(int, int, unsigned) override;
+	void touch_press(int, int, unsigned) override;
+	void touch_release(int, int, unsigned) override;
+	void touch_motion(int, int, unsigned) override;
+	void focus_in() override;
+	bool navigate(Navigation) override;
 private:
-	virtual void on_style_change();
+	void on_style_change() override;
 
 	void move_focus(Navigation, bool);
 	void set_focus_index(int);
@@ -230,6 +243,8 @@ private:
 	static void adjust_index(int &, int, int);
 };
 
+MSPGLTK_API void operator>>(const LexicalConverter &, List::ViewMode &);
+
 } // namespace GLtk
 } // namespace Msp