X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flist.cpp;h=963b442775f982840f27b6d796437f02227e9fac;hb=9678abb23abe450109e2feda081f5bba5f20cc94;hp=5d179e195c36c412785a17ec7d731f65856f420d;hpb=b3de715986f0e5b6359a2109c27d052c3d9cc27a;p=libs%2Fgltk.git

diff --git a/source/list.cpp b/source/list.cpp
index 5d179e1..963b442 100644
--- a/source/list.cpp
+++ b/source/list.cpp
@@ -3,12 +3,12 @@
 #include <msp/gl/matrix.h>
 #include <msp/gl/meshbuilder.h>
 #include <msp/input/keys.h>
+#include <msp/strings/format.h>
 #include "graphic.h"
 #include "list.h"
 #include "part.h"
 #include "style.h"
 #include "text.h"
-#include "vslider.h"
 
 using namespace std;
 
@@ -21,36 +21,17 @@ incompatible_data::incompatible_data(const type_info &ti):
 
 
 List::List():
-	data(new BasicListData<string>),
-	own_data(true)
+	List(*new BasicListData<string>)
 {
-	init();
+	own_data = true;
 }
 
 List::List(ListData &d):
 	data(&d),
-	own_data(false)
-{
-	init();
-}
-
-void List::init()
+	observer(new DataObserver(*this))
 {
 	input_type = INPUT_NAVIGATION;
 
-	item_factory = 0;
-	sel_index = -1;
-	focus_index = -1;
-	first = 0;
-	max_scroll = 0;
-	view_size = 5;
-	ignore_slider_change = false;
-	dragging = false;
-	drag_start_x = 0;
-	drag_start_y = 0;
-
-	observer = new DataObserver(*this);
-
 	add(slider);
 	slider.set_step(1);
 	slider.signal_value_changed.connect(sigc::mem_fun(this, &List::slider_value_changed));
@@ -70,22 +51,34 @@ void List::autosize_special(const Part &part, Geometry &ageom) const
 	{
 		const Sides &margin = part.get_margin();
 
-		unsigned max_w = 0;
-		unsigned total_h = 0;
+		unsigned items_w = 0;
+		unsigned items_h = 0;
 		for(unsigned i=0; i<items.size(); ++i)
 		{
 			Geometry igeom;
 			items[i]->autosize(igeom);
-			max_w = max(max_w, igeom.w);
-			if(view_size==0 || i<view_size)
-				total_h += igeom.h;
+			items_w = max(items_w, igeom.w);
+			items_h = max(items_h, igeom.h);
 		}
 
-		if(!items.empty() && items.size()<view_size)
-			total_h = total_h*view_size/items.size();
+		if(view_mode==GRID)
+		{
+			unsigned r = view_rows;
+			unsigned c = view_columns;
+			if(r==0 && c==0)
+				r = sqrt(items.size());
+			if(r==0)
+				r = (items.size()+c-1)/c;
+			if(c==0)
+				c = (items.size()+r-1)/r;
+			items_w *= c;
+			items_h *= r;
+		}
+		else
+			items_h *= (view_rows==0 ? items.size() : view_rows);
 
-		ageom.w = max(ageom.w, max_w+margin.left+margin.right);
-		ageom.h = max(ageom.h, total_h+margin.top+margin.bottom);
+		ageom.w = max(ageom.w, items_w+margin.left+margin.right);
+		ageom.h = max(ageom.h, items_h+margin.top+margin.bottom);
 	}
 	else if(part.get_name()=="slider")
 		autosize_child(slider, part, ageom);
@@ -104,8 +97,8 @@ void List::set_data(ListData &d)
 	own_data = false;
 	observer = new DataObserver(*this);
 
-	for(vector<Item *>::iterator i=items.begin(); i!=items.end(); ++i)
-		delete *i;
+	for(Item *i: items)
+		delete i;
 	items.clear();
 	unsigned n_items = data->size();
 	for(unsigned i=0; i<n_items; ++i)
@@ -120,12 +113,12 @@ void List::set_data(ListData &d)
 void List::items_changed()
 {
 	signal_autosize_changed.emit();
-	rebuild();
+	mark_rebuild();
 }
 
 List::Item *List::create_item(unsigned index)
 {
-	Item *item = 0;
+	Item *item = nullptr;
 	if(item_factory)
 		item = item_factory->create_item(index);
 	else
@@ -140,7 +133,13 @@ List::Item *List::create_item(unsigned index)
 
 void List::set_view_size(unsigned s)
 {
-	view_size = s;
+	set_view_size(s, s);
+}
+
+void List::set_view_size(unsigned r, unsigned c)
+{
+	view_rows = r;
+	view_columns = c;
 	signal_autosize_changed.emit();
 }
 
@@ -163,7 +162,7 @@ void List::set_selected_index(int i)
 	{
 		sel_index = -1;
 		focus_index = -1;
-		set_input_focus(0);
+		set_input_focus(nullptr);
 		signal_selection_cleared.emit();
 	}
 	else
@@ -179,7 +178,7 @@ void List::set_selected_index(int i)
 
 void List::set_selected_item(Widget *item)
 {
-	for(unsigned i=first; (i<items.size() && items[i]->is_visible()); ++i)
+	for(unsigned i=rows[first_row].first; (i<items.size() && items[i]->is_visible()); ++i)
 		if(item==items[i])
 			return set_selected_index(i);
 }
@@ -191,34 +190,12 @@ void List::rebuild_special(const Part &part)
 	else if(part.get_name()=="items")
 	{
 		SetFlag flag(ignore_slider_change);
+		reposition_items(true);
+		unsigned old_first_row = first_row;
+		unsigned old_max_scroll = max_scroll;
 		check_view_range();
-
-		const Sides &margin = part.get_margin();
-		unsigned w = geom.w-min(geom.w, margin.left+margin.right);
-		unsigned y = geom.h-min(geom.h, margin.top);
-		for(unsigned i=0; i<items.size(); ++i)
-		{
-			if(i<first || !y)
-				items[i]->set_visible(false);
-			else
-			{
-				Geometry igeom = items[i]->get_geometry();
-				if(igeom.h+margin.bottom<=y)
-				{
-					items[i]->set_visible(true);
-					y -= igeom.h;
-					igeom.x = margin.left;
-					igeom.y = y;
-					igeom.w = w;
-					items[i]->set_geometry(igeom);
-				}
-				else
-				{
-					items[i]->set_visible(false);
-					y = 0;
-				}
-			}
-		}
+		if(first_row!=old_first_row || max_scroll!=old_max_scroll)
+			reposition_items(false);
 	}
 
 	Widget::rebuild_special(part);
@@ -228,7 +205,7 @@ void List::render_special(const Part &part, GL::Renderer &renderer) const
 {
 	if(part.get_name()=="items")
 	{
-		for(unsigned i=first; (i<items.size() && items[i]->is_visible()); ++i)
+		for(unsigned i=rows[first_row].first; (i<items.size() && items[i]->is_visible()); ++i)
 			items[i]->render(renderer);
 	}
 	else if(part.get_name()=="slider")
@@ -254,13 +231,13 @@ void List::button_press(int x, int y, unsigned btn)
 		unsigned change = 3;
 		if(btn==4)
 		{
-			change = min(first, change);
-			slider.set_value(max_scroll-(first-change));
+			change = min(first_row, change);
+			slider.set_value(max_scroll-(first_row-change));
 		}
 		else if(btn==5)
 		{
-			change = min(max_scroll-first, change);
-			slider.set_value(max_scroll-(first+change));
+			change = min(max_scroll-first_row, change);
+			slider.set_value(max_scroll-(first_row+change));
 		}
 	}
 	else
@@ -304,22 +281,22 @@ void List::touch_motion(int, int y, unsigned finger)
 	if(finger==0 && !items.empty() && dragging)
 	{
 		int dy = y-drag_start_y;
-		if(dy>0 && first<max_scroll)
+		if(dy>0 && first_row<max_scroll)
 		{
-			int item_h = items[first]->get_geometry().h;
-			if(dy>item_h)
+			int row_h = rows[first_row].height;
+			if(dy>row_h)
 			{
-				drag_start_y += item_h;
-				slider.set_value(max_scroll-(first+1));
+				drag_start_y += row_h;
+				slider.set_value(max_scroll-(first_row+1));
 			}
 		}
-		else if(dy<0 && first>0)
+		else if(dy<0 && first_row>0)
 		{
-			int item_h = items[first-1]->get_geometry().h;
-			if(-dy>item_h)
+			int row_h = rows[first_row-1].height;
+			if(-dy>row_h)
 			{
-				drag_start_y -= item_h;
-				slider.set_value(max_scroll-(first-1));
+				drag_start_y -= row_h;
+				slider.set_value(max_scroll-(first_row-1));
 			}
 		}
 	}
@@ -335,13 +312,13 @@ void List::focus_in()
 		if(sel_index>=0 && items[sel_index]->is_visible())
 			set_focus_index(sel_index);
 		else if(!items.empty())
-			set_focus_index(first);
+			set_focus_index(rows[first_row].first);
 	}
 }
 
 bool List::navigate(Navigation nav)
 {
-	if((nav==NAV_UP || nav==NAV_DOWN) && !items.empty())
+	if((nav==NAV_UP || nav==NAV_DOWN || ((nav==NAV_LEFT || nav==NAV_RIGHT) && view_mode==GRID)) && !items.empty())
 		move_focus(nav, true);
 	else if(nav==NAV_ACTIVATE)
 		set_selected_index(focus_index);
@@ -351,14 +328,35 @@ bool List::navigate(Navigation nav)
 	return true;
 }
 
+void List::on_style_change()
+{
+	items_part = (style ? style->find_part("items") : nullptr);
+}
+
 void List::move_focus(Navigation nav, bool select)
 {
-	if(nav==NAV_UP)
+	if(nav==NAV_UP && view_mode==GRID)
+	{
+		unsigned row = item_index_to_row(focus_index);
+		if(row>0)
+			set_focus_index(rows[row-1].first+focus_index-rows[row].first);
+		else
+			set_focus_index(0);
+	}
+	else if(nav==NAV_DOWN && view_mode==GRID)
+	{
+		unsigned row = item_index_to_row(focus_index);
+		if(row+1<rows.size())
+			set_focus_index(rows[row+1].first+focus_index-rows[row].first);
+		else
+			set_focus_index(items.size()-1);
+	}
+	else if(nav==NAV_UP || (nav==NAV_LEFT && view_mode==GRID))
 	{
 		if(focus_index>0)
 			set_focus_index(focus_index-1);
 	}
-	else if(nav==NAV_DOWN)
+	else if(nav==NAV_DOWN || (nav==NAV_RIGHT && view_mode==GRID))
 	{
 		if(static_cast<unsigned>(focus_index+1)<items.size())
 			set_focus_index(focus_index+1);
@@ -383,25 +381,80 @@ void List::item_autosize_changed(Item *item)
 {
 	item->autosize();
 	signal_autosize_changed.emit();
-	rebuild();
+	mark_rebuild();
 }
 
-unsigned List::last_to_first(unsigned last) const
+void List::reposition_items(bool record_rows)
 {
-	if(!style)
-		return last;
+	if(!items_part)
+		return;
 
-	unsigned view_h = geom.h;
-	if(const Part *items_part = style->get_part("items"))
+	if(record_rows)
 	{
-		const Sides &margin = items_part->get_margin();
-		view_h -= margin.top+margin.bottom;
+		rows.clear();
+		rows.push_back(0);
 	}
 
+	const Sides &margin = items_part->get_margin();
+	unsigned view_w = geom.w-min(geom.w, margin.left+margin.right);
+	unsigned x = 0;
+	unsigned y = 0;
+	unsigned row_h = 0;
+	for(unsigned i=0; i<items.size(); ++i)
+	{
+		const Geometry &igeom = items[i]->get_geometry();
+
+		if(view_mode!=GRID || (x>0 && x+igeom.w>view_w))
+		{
+			x = 0;
+			if(y)
+				y -= row_h;
+			if(record_rows && i>0)
+			{
+				rows.back().height = row_h;
+				rows.push_back(i);
+			}
+			row_h = 0;
+		}
+
+		if(first_row<rows.size() && i==rows[first_row].first)
+			y = geom.h-min(geom.h, margin.top);
+
+		if(!y)
+			items[i]->set_visible(false);
+		else if(igeom.h+margin.bottom<=y)
+		{
+			items[i]->set_visible(true);
+			unsigned iw = (view_mode==GRID ? igeom.w : view_w);
+			items[i]->set_geometry(Geometry(margin.left+x, y-igeom.h, iw, igeom.h));
+		}
+		else
+		{
+			for(unsigned j=rows.back().first; j<=i; ++j)
+				items[j]->set_visible(false);
+			y = 0;
+		}
+
+		x += igeom.w;
+		row_h = max(row_h, igeom.h);
+	}
+
+	if(record_rows)
+		rows.back().height = row_h;
+}
+
+unsigned List::last_to_first_row(unsigned last) const
+{
+	if(!items_part)
+		return last;
+
+	const Sides &margin = items_part->get_margin();
+	unsigned view_h = geom.h-min(geom.h, margin.top+margin.bottom);
+
 	unsigned items_h = 0;
-	for(unsigned i=last; i<items.size(); --i)
+	for(unsigned i=last; i<rows.size(); --i)
 	{
-		items_h += items[i]->get_geometry().h;
+		items_h += rows[i].height;
 		if(items_h>view_h)
 			return min(i+1, last);
 	}
@@ -409,6 +462,14 @@ unsigned List::last_to_first(unsigned last) const
 	return 0;
 }
 
+unsigned List::item_index_to_row(unsigned index) const
+{
+	for(unsigned i=0; i+1<rows.size(); ++i)
+		if(rows[i+1].first>index)
+			return i;
+	return rows.size()-1;
+}
+
 void List::check_view_range()
 {
 	if(!style)
@@ -417,13 +478,14 @@ void List::check_view_range()
 	if(items.empty())
 		max_scroll = 0;
 	else
-		max_scroll = last_to_first(items.size()-1);
+		max_scroll = last_to_first_row(rows.size()-1);
 
-	if(first>max_scroll)
-		first = max_scroll;
+	if(first_row>max_scroll)
+		first_row = max_scroll;
 
 	slider.set_range(0, max_scroll);
-	slider.set_value(max_scroll-first);
+	slider.set_page_size(rows.size()-max_scroll);
+	slider.set_value(max_scroll-first_row);
 }
 
 void List::scroll_to_focus()
@@ -431,18 +493,19 @@ void List::scroll_to_focus()
 	if(focus_index<0 || items[focus_index]->is_visible())
 		return;
 
-	if(static_cast<unsigned>(focus_index)<first)
-		slider.set_value(max_scroll-focus_index);
+	unsigned focus_row = item_index_to_row(static_cast<unsigned>(focus_index));
+	if(focus_row<first_row)
+		slider.set_value(max_scroll-focus_row);
 	else
-		slider.set_value(max_scroll-last_to_first(focus_index));
+		slider.set_value(max_scroll-last_to_first_row(focus_row));
 }
 
 void List::slider_value_changed(double value)
 {
 	if(max_scroll>0 && !ignore_slider_change)
 	{
-		first = max_scroll-static_cast<unsigned>(value);
-		rebuild();
+		first_row = max_scroll-static_cast<unsigned>(value);
+		mark_rebuild();
 	}
 }
 
@@ -492,8 +555,8 @@ void List::DataObserver::cleared()
 {
 	list.sel_index = -1;
 	list.focus_index = -1;
-	for(vector<Item *>::iterator i=list.items.begin(); i!=list.items.end(); ++i)
-		delete *i;
+	for(Item *i: list.items)
+		delete i;
 	list.items.clear();
 	list.items_changed();
 
@@ -504,21 +567,26 @@ void List::DataObserver::refresh_item(unsigned i)
 {
 	delete list.items[i];
 	// Avoid stale pointer while create_item is executing
-	list.items[i] = 0;
+	list.items[i] = nullptr;
 	list.items[i] = list.create_item(i);
 	list.items_changed();
 }
 
 
+List::Item::Item()
+{
+	input_type = INPUT_NAVIGATION;
+}
+
 void List::Item::autosize_special(const Part &part, Geometry &ageom) const
 {
 	if(part.get_name()=="children")
 	{
 		const Sides &margin = part.get_margin();
-		for(list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
+		for(const Child *c: children)
 		{
 			Geometry cgeom;
-			(*i)->widget->autosize(cgeom);
+			c->widget->autosize(cgeom);
 			ageom.w = max(ageom.w, cgeom.x+cgeom.w+margin.right);
 			ageom.h = max(ageom.h, cgeom.y+cgeom.h+margin.top);
 		}
@@ -534,8 +602,23 @@ void List::Item::render_special(const Part &part, GL::Renderer &renderer) const
 {
 	if(part.get_name()=="children")
 	{
-		for(list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
-			(*i)->widget->render(renderer);
+		for(const Child *c: children)
+			c->widget->render(renderer);
+	}
+}
+
+
+void List::SimpleItem::on_style_change()
+{
+	if(!style || children.empty())
+		return;
+
+	Widget *child = children.front()->widget;
+	child->autosize();
+	if(const Part *part = style->find_part("children"))
+	{
+		const Sides &margin = part->get_margin();
+		child->set_position(margin.left, margin.bottom);
 	}
 }
 
@@ -546,12 +629,13 @@ void List::MultiColumnItem::check_widths(vector<unsigned> &widths) const
 		widths.resize(children.size(), 0);
 
 	unsigned n = 0;
-	for(list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i, ++n)
+	for(const Child *c: children)
 	{
 		Geometry cgeom;
-		(*i)->widget->autosize(cgeom);
+		c->widget->autosize(cgeom);
 		// TODO invent a better way to specify spacings
 		widths[n] = max(widths[n], cgeom.w+8);
+		++n;
 	}
 }
 
@@ -560,17 +644,17 @@ void List::MultiColumnItem::set_widths(const vector<unsigned> &widths)
 	if(!style)
 		return;
 
-	const Part *part = style->get_part("children");
+	const Part *part = style->find_part("children");
 	if(!part)
 		return;
 
 	const Sides &margin = part->get_margin();
 	int x = margin.left;
 	unsigned n = 0;
-	for(list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i, ++n)
+	for(const Child *c: children)
 	{
-		(*i)->widget->set_position(x, margin.bottom);
-		x += widths[n];
+		c->widget->set_position(x, margin.bottom);
+		x += widths[n++];
 	}
 }
 
@@ -579,14 +663,14 @@ void List::MultiColumnItem::on_style_change()
 	if(!style)
 		return;
 
-	for(std::list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
-		(*i)->widget->autosize();
+	for(const Child *c: children)
+		c->widget->autosize();
 
 	vector<unsigned> widths;
 	List *list = static_cast<List *>(parent);
-	for(vector<Item *>::const_iterator i=list->items.begin(); i!=list->items.end(); ++i)
-		if(*i!=this)
-			if(MultiColumnItem *mci = dynamic_cast<MultiColumnItem *>(*i))
+	for(Item *i: list->items)
+		if(i!=this)
+			if(MultiColumnItem *mci = dynamic_cast<MultiColumnItem *>(i))
 				mci->check_widths(widths);
 
 	vector<unsigned> self_widths(widths);
@@ -597,8 +681,8 @@ void List::MultiColumnItem::on_style_change()
 
 	if(update_all)
 	{
-		for(vector<Item *>::const_iterator i=list->items.begin(); i!=list->items.end(); ++i)
-			if(MultiColumnItem *mci = dynamic_cast<MultiColumnItem *>(*i))
+		for(Item *i: list->items)
+			if(MultiColumnItem *mci = dynamic_cast<MultiColumnItem *>(i))
 				mci->set_widths(self_widths);
 	}
 
@@ -612,25 +696,14 @@ List::BasicItem::BasicItem(const string &text):
 	add(label);
 }
 
-void List::BasicItem::on_style_change()
-{
-	if(!style)
-		return;
-
-	label.autosize();
-	if(const Part *part = style->get_part("children"))
-	{
-		const Sides &margin = part->get_margin();
-		label.set_position(margin.left, margin.bottom);
-	}
-}
-
 
 List::Loader::Loader(List &l):
 	DataFile::DerivedObjectLoader<List, Widget::Loader>(l)
 {
 	add("item", &Loader::item);
-	add("view_size", &List::view_size);
+	add("view_mode", &List::view_mode);
+	add("view_size", &List::view_rows);
+	add("view_size", &List::view_rows, &List::view_columns);
 }
 
 void List::Loader::item(const string &v)
@@ -638,5 +711,17 @@ void List::Loader::item(const string &v)
 	dynamic_cast<BasicListData<string> &>(*obj.data).append(v);
 }
 
+
+void operator>>(const LexicalConverter &conv, List::ViewMode &vm)
+{
+	const string &str = conv.get();
+	if(str=="LIST")
+		vm = List::LIST;
+	else if(str=="GRID")
+		vm = List::GRID;
+	else
+		throw lexical_error(format("conversion of '%s' to List::ViewMode", str));
+}
+
 } // namespace GLtk
 } // namespace Msp