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

diff --git a/source/list.h b/source/list.h
index ef4311e..9bc30c6 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,7 +16,7 @@ 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 &);
@@ -27,9 +28,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,8 +62,11 @@ private:
 	};
 
 public:
-	class Item: public Container
+	class Item: virtual public Widget, protected Container
 	{
+	protected:
+		Item();
+
 	public:
 		virtual const char *get_class() const { return "listitem"; }
 
@@ -70,17 +80,20 @@ public:
 
 	class SimpleItem: public Item
 	{
-	private:
+	protected:
+		SimpleItem() = default;
+
 		virtual void on_style_change();
 	};
 
 	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();
 	};
 
@@ -97,9 +110,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;
@@ -144,20 +157,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 = 0;
+	bool own_data = false;
+	DataObserver *observer = 0;
+	ItemFactory *item_factory = 0;
+	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 = 0;
+	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,9 +181,6 @@ private:
 public:
 	List();
 	List(ListData &);
-private:
-	void init();
-public:
 	virtual ~List();
 
 	virtual const char *get_class() const { return "list"; }
@@ -195,7 +207,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);
@@ -230,6 +244,8 @@ private:
 	static void adjust_index(int &, int, int);
 };
 
+MSPGLTK_API void operator>>(const LexicalConverter &, List::ViewMode &);
+
 } // namespace GLtk
 } // namespace Msp