X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flist.cpp;h=042eb20ab7b85dbd052d3274351b03287c09614e;hb=1afb4f8d6379ad1bf832692fbfedef9714ee3ff5;hp=c5dddf5aaac8533c0f40bec86ed53f7e171c6e37;hpb=d9bf5e84b71e634b68011e321ee13caa3299adbf;p=libs%2Fgltk.git

diff --git a/source/list.cpp b/source/list.cpp
index c5dddf5..042eb20 100644
--- a/source/list.cpp
+++ b/source/list.cpp
@@ -78,6 +78,8 @@ void List::autosize_special(const Part &part, Geometry &ageom) const
 		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)
@@ -121,7 +123,6 @@ List::Item *List::create_item(unsigned index)
 	else
 		item = new BasicItem(data->get_string(index));
 	add(*item);
-	item->autosize();
 	item->signal_autosize_changed.connect(sigc::mem_fun(this, &List::item_autosize_changed));
 	return item;
 }
@@ -157,6 +158,13 @@ void List::set_selected_index(int i)
 	}
 }
 
+void List::rebuild_special(const Part &part)
+{
+	if(part.get_name()=="slider")
+		reposition_child(slider, part);
+	Widget::rebuild_special(part);
+}
+
 void List::render_special(const Part &part, GL::Renderer &renderer) const
 {
 	if(part.get_name()=="items")
@@ -184,7 +192,6 @@ void List::button_press(int x, int y, unsigned btn)
 
 void List::on_geometry_change()
 {
-	reposition_slider();
 	reposition_items();
 
 	check_view_range();
@@ -195,25 +202,11 @@ 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::item_autosize_changed()
 {
 	signal_autosize_changed.emit();
@@ -352,7 +345,8 @@ void List::Item::autosize_special(const Part &part, Geometry &ageom) const
 		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);
 		}
@@ -374,6 +368,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)
 {