X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flist.h;h=c0ea6d25a5a0b6353fd36bb45248f02659624610;hb=7b555d7c7bd9d3236e251039be950358bf318393;hp=dd3ddaa6d5e12100deff93187e068af07eaf1ceb;hpb=3ed9c4e3e26dbdce188c32d2dc63c3f921f053e3;p=libs%2Fgltk.git

diff --git a/source/list.h b/source/list.h
index dd3ddaa..c0ea6d2 100644
--- a/source/list.h
+++ b/source/list.h
@@ -61,13 +61,23 @@ 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;
 	};
 
+	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
 	{
@@ -120,6 +130,7 @@ private:
 
 public:
 	sigc::signal<void, unsigned> signal_item_selected;
+	sigc::signal<void> signal_selection_cleared;
 
 private:
 	ListData *data;
@@ -127,9 +138,14 @@ private:
 	DataObserver *observer;
 	ItemFactory *item_factory;
 	int sel_index;
+	int focus_index;
 	unsigned first;
 	unsigned max_scroll;
 	unsigned view_size;
+	bool ignore_slider_change;
+	bool dragging;
+	int drag_start_x;
+	int drag_start_y;
 
 	VSlider slider;
 	std::vector<Item *> items;
@@ -145,7 +161,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 &);
@@ -171,21 +187,28 @@ 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 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 set_focus_index(int);
 
-	void reposition_slider();
 	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