X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flist.cpp;h=f42d573866317c643473e8b678e76cf543a677a5;hb=dd64d5f2e50cb17ad97631b0f577f4bf213d3da5;hp=296709ce4f300b773a2035acade69ae053268725;hpb=d1b8c27fd3fff14ef85913b601c160b5c435bdff;p=libs%2Fgltk.git

diff --git a/source/list.cpp b/source/list.cpp
index 296709c..f42d573 100644
--- a/source/list.cpp
+++ b/source/list.cpp
@@ -1,3 +1,5 @@
+#include <msp/core/raii.h>
+#include <msp/debug/demangle.h>
 #include <msp/gl/matrix.h>
 #include <msp/gl/meshbuilder.h>
 #include "graphic.h"
@@ -12,6 +14,11 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
+incompatible_data::incompatible_data(const type_info &ti):
+	logic_error("expected "+Debug::demangle(ti.name()))
+{ }
+
+
 List::List():
 	data(new BasicListData<string>),
 	own_data(true)
@@ -28,10 +35,12 @@ List::List(ListData &d):
 
 void List::init()
 {
+	item_factory = 0;
 	sel_index = -1;
 	first = 0;
 	max_scroll = 0;
 	view_size = 5;
+	ignore_slider_change = false;
 
 	observer = new DataObserver(*this);
 
@@ -42,12 +51,13 @@ void List::init()
 
 List::~List()
 {
+	delete item_factory;
 	delete observer;
 	if(own_data)
 		delete data;
 }
 
-void List::autosize_special(const Part &part, Geometry &ageom)
+void List::autosize_special(const Part &part, Geometry &ageom) const
 {
 	if(part.get_name()=="items")
 	{
@@ -57,8 +67,8 @@ void List::autosize_special(const Part &part, Geometry &ageom)
 		unsigned total_h = 0;
 		for(unsigned i=0; i<items.size(); ++i)
 		{
-			items[i]->autosize();
-			const Geometry &igeom = items[i]->get_geometry();
+			Geometry igeom;
+			items[i]->autosize(igeom);
 			max_w = max(max_w, igeom.w);
 			if(view_size==0 || i<view_size)
 				total_h += igeom.h;
@@ -70,10 +80,15 @@ void List::autosize_special(const Part &part, Geometry &ageom)
 		ageom.w = max(ageom.w, max_w+margin.left+margin.right);
 		ageom.h = max(ageom.h, total_h+margin.top+margin.bottom);
 	}
+	else if(part.get_name()=="slider")
+		autosize_child(slider, part, ageom);
 }
 
 void List::set_data(ListData &d)
 {
+	if(item_factory)
+		item_factory->set_data(d);
+
 	delete observer;
 	if(own_data)
 		delete data;
@@ -82,19 +97,36 @@ 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;
+	items.clear();
+	unsigned n_items = data->size();
+	for(unsigned i=0; i<n_items; ++i)
+	{
+		Item *item = create_item(i);
+		items.push_back(item);
+	}
+
 	items_changed();
 }
 
 void List::items_changed()
 {
-	check_view_range();
 	signal_autosize_changed.emit();
-	reposition_items();
+	rebuild();
 }
 
 List::Item *List::create_item(unsigned index)
 {
-	return new BasicItem(data->get_string(index));
+	Item *item = 0;	
+	if(item_factory)
+		item = item_factory->create_item(index);
+	else
+		item = new BasicItem(data->get_string(index));
+	add(*item);
+	item->autosize();
+	item->signal_autosize_changed.connect(sigc::bind(sigc::mem_fun(this, &List::item_autosize_changed), item));
+	return item;
 }
 
 void List::set_view_size(unsigned s)
@@ -110,14 +142,17 @@ void List::set_view_all()
 
 void List::set_selected_index(int i)
 {
-	if(i>static_cast<int>(data->size()))
+	if(i>=static_cast<int>(data->size()))
 		throw out_of_range("List::set_selected_index");
 
+	if(i==sel_index)
+		return;
+
 	if(sel_index>=0)
 		items[sel_index]->set_active(false);
 	if(i<0)
 		sel_index = -1;
-	else if(i!=sel_index)
+	else
 	{
 		sel_index = i;
 		items[sel_index]->set_active(true);
@@ -125,73 +160,18 @@ void List::set_selected_index(int i)
 	}
 }
 
-void List::render_special(const Part &part, GL::Renderer &renderer) const
+void List::rebuild_special(const Part &part)
 {
-	if(part.get_name()=="items")
+	if(part.get_name()=="slider")
+		reposition_child(slider, part);
+	else if(part.get_name()=="items")
 	{
-		for(unsigned i=first; (i<items.size() && items[i]->is_visible()); ++i)
-			items[i]->render(renderer);
-	}
-	else if(part.get_name()=="slider")
-		slider.render(renderer);
-}
+		SetFlag flag(ignore_slider_change);
+		check_view_range();
 
-void List::button_press(int x, int y, unsigned btn)
-{
-	Container::button_press(x, y, btn);
-	if(click_focus && btn==1)
-	{
-		for(unsigned i=first; (i<items.size() && items[i]->is_visible()); ++i)
-			if(click_focus==items[i])
-			{
-				set_selected_index(i);
-				break;
-			}
-	}
-}
-
-void List::on_geometry_change()
-{
-	reposition_slider();
-	reposition_items();
-
-	check_view_range();
-}
-
-void List::on_style_change()
-{
-	if(!style)
-		return;
-
-	reposition_slider();
-	reposition_items();
-
-	check_view_range();
-}
-
-void List::reposition_slider()
-{
-	if(!style)
-		return;
-
-	if(const Part *slider_part = style->get_part("slider"))
-	{
-		Geometry sgeom = slider_part->get_geometry();
-		slider_part->get_alignment().apply(sgeom, geom, slider_part->get_margin());
-		slider.set_geometry(sgeom);
-	}
-}
-
-void List::reposition_items()
-{
-	if(!style)
-		return;
-
-	if(const Part *items_part = style->get_part("items"))
-	{
-		const Sides &margin = items_part->get_margin();
-		unsigned w = geom.w-margin.left-margin.right;
-		unsigned y = geom.h-margin.top;
+		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)
@@ -216,6 +196,40 @@ void List::reposition_items()
 			}
 		}
 	}
+
+	Widget::rebuild_special(part);
+}
+
+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)
+			items[i]->render(renderer);
+	}
+	else if(part.get_name()=="slider")
+		slider.render(renderer);
+}
+
+void List::button_press(int x, int y, unsigned btn)
+{
+	Container::button_press(x, y, btn);
+	if(click_focus && btn==1)
+	{
+		for(unsigned i=first; (i<items.size() && items[i]->is_visible()); ++i)
+			if(click_focus==items[i])
+			{
+				set_selected_index(i);
+				break;
+			}
+	}
+}
+
+void List::item_autosize_changed(Item *item)
+{
+	item->autosize();
+	signal_autosize_changed.emit();
+	rebuild();
 }
 
 void List::check_view_range()
@@ -250,10 +264,10 @@ void List::check_view_range()
 
 void List::slider_value_changed(double value)
 {
-	if(max_scroll>0)
+	if(max_scroll>0 && !ignore_slider_change)
 	{
 		first = max_scroll-static_cast<unsigned>(value);
-		reposition_items();
+		rebuild();
 	}
 }
 
@@ -264,7 +278,7 @@ List::DataObserver::DataObserver(List &l):
 	list.data->signal_item_added.connect(sigc::mem_fun(this, &DataObserver::item_added));
 	list.data->signal_item_removed.connect(sigc::mem_fun(this, &DataObserver::item_removed));
 	list.data->signal_cleared.connect(sigc::mem_fun(this, &DataObserver::cleared));
-	list.data->signal_refresh_strings.connect(sigc::mem_fun(this, &DataObserver::refresh_strings));
+	list.data->signal_refresh_item.connect(sigc::mem_fun(this, &DataObserver::refresh_item));
 }
 
 void List::DataObserver::item_added(unsigned i)
@@ -273,7 +287,6 @@ void List::DataObserver::item_added(unsigned i)
 		++list.sel_index;
 
 	Item *item = list.create_item(i);
-	list.add(*item);
 	list.items.insert(list.items.begin()+i, item);
 	list.items_changed();
 }
@@ -299,20 +312,25 @@ void List::DataObserver::cleared()
 	list.items_changed();
 }
 
-void List::DataObserver::refresh_strings()
+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] = list.create_item(i);
 	list.items_changed();
 }
 
 
-void List::Item::autosize_special(const Part &part, Geometry &ageom)
+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)
 		{
-			const Geometry &cgeom = (*i)->widget->get_geometry();
+			Geometry cgeom;
+			(*i)->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);
 		}
@@ -334,6 +352,72 @@ void List::Item::render_special(const Part &part, GL::Renderer &renderer) const
 }
 
 
+void List::MultiColumnItem::check_widths(vector<unsigned> &widths) const
+{
+	if(widths.size()<children.size())
+		widths.resize(children.size(), 0);
+
+	unsigned n = 0;
+	for(list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i, ++n)
+	{
+		Geometry cgeom;
+		(*i)->widget->autosize(cgeom);
+		// TODO invent a better way to specify spacings
+		widths[n] = max(widths[n], cgeom.w+8);
+	}
+}
+
+void List::MultiColumnItem::set_widths(const vector<unsigned> &widths)
+{
+	if(!style)
+		return;
+
+	const Part *part = style->get_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)
+	{
+		(*i)->widget->set_position(x, margin.bottom);
+		x += widths[n];
+	}
+}
+
+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();
+
+	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))
+				mci->check_widths(widths);
+
+	vector<unsigned> self_widths(widths);
+	check_widths(self_widths);
+	bool update_all = false;
+	for(unsigned i=0; (!update_all && i<widths.size() && i<self_widths.size()); ++i)
+		update_all = self_widths[i]>widths[i];
+
+	if(update_all)
+	{
+		for(vector<Item *>::const_iterator i=list->items.begin(); i!=list->items.end(); ++i)
+			if(MultiColumnItem *mci = dynamic_cast<MultiColumnItem *>(*i))
+				mci->set_widths(self_widths);
+	}
+	else
+		set_widths(self_widths);
+}
+
+
 List::BasicItem::BasicItem(const string &text):
 	label(text)
 {
@@ -358,6 +442,7 @@ List::Loader::Loader(List &l):
 	DataFile::DerivedObjectLoader<List, Widget::Loader>(l)
 {
 	add("item", &Loader::item);
+	add("view_size", &List::view_size);
 }
 
 void List::Loader::item(const string &v)