X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flist.h;h=43a24576a1ecf1904d29d1a58eb104c61a790d00;hb=9faf932be00ba7ec7ed8c81f1e7971dcfa2b2085;hp=6f6aec1f9dcf50d2dd5b5ead0fb66db4790b5d72;hpb=707b59d45ae50b69c94918f8f74313283b304597;p=libs%2Fgltk.git

diff --git a/source/list.h b/source/list.h
index 6f6aec1..43a2457 100644
--- a/source/list.h
+++ b/source/list.h
@@ -68,17 +68,30 @@ public:
 		virtual void render_special(const Part &, GL::Renderer &) const;
 	};
 
+	class SimpleItem: public Item
+	{
+	private:
+		virtual void on_style_change();
+	};
+
+	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
+	class BasicItem: public SimpleItem
 	{
 	private:
 		Label label;
 
 	public:
 		BasicItem(const std::string &);
-
-	private:
-		virtual void on_style_change();
 	};
 
 	class ItemFactory
@@ -120,6 +133,7 @@ private:
 
 public:
 	sigc::signal<void, unsigned> signal_item_selected;
+	sigc::signal<void> signal_selection_cleared;
 
 private:
 	ListData *data;
@@ -127,9 +141,15 @@ private:
 	DataObserver *observer;
 	ItemFactory *item_factory;
 	int sel_index;
+	int focus_index;
 	unsigned first;
 	unsigned max_scroll;
 	unsigned view_size;
+	const Part *items_part;
+	bool ignore_slider_change;
+	bool dragging;
+	int drag_start_x;
+	int drag_start_y;
 
 	VSlider slider;
 	std::vector<Item *> items;
@@ -171,21 +191,32 @@ public:
 
 	void set_selected_index(int);
 	int get_selected_index() const { return sel_index; }
-
 private:
+	void set_selected_item(Widget *);
+
+	virtual void rebuild_special(const Part &);
 	virtual void render_special(const Part &, GL::Renderer &) const;
 
 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);
 private:
-	virtual void on_geometry_change();
 	virtual void on_style_change();
 
-	void reposition_slider();
+	void move_focus(Navigation, bool);
+	void set_focus_index(int);
+
 	void item_autosize_changed(Item *);
-	void reposition_items();
+	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