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

diff --git a/source/list.cpp b/source/list.cpp
index c5dddf5..14c779f 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)
@@ -108,9 +110,8 @@ void List::set_data(ListData &d)
 
 void List::items_changed()
 {
-	check_view_range();
 	signal_autosize_changed.emit();
-	reposition_items();
+	rebuild();
 }
 
 List::Item *List::create_item(unsigned index)
@@ -122,7 +123,7 @@ List::Item *List::create_item(unsigned index)
 		item = new BasicItem(data->get_string(index));
 	add(*item);
 	item->autosize();
-	item->signal_autosize_changed.connect(sigc::mem_fun(this, &List::item_autosize_changed));
+	item->signal_autosize_changed.connect(sigc::bind(sigc::mem_fun(this, &List::item_autosize_changed), item));
 	return item;
 }
 
@@ -157,77 +158,13 @@ void List::set_selected_index(int i)
 	}
 }
 
-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::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::item_autosize_changed()
+void List::rebuild_special(const Part &part)
 {
-	signal_autosize_changed.emit();
-	reposition_items();
-}
-
-void List::reposition_items()
-{
-	if(!style)
-		return;
-
-	if(const Part *items_part = style->get_part("items"))
+	if(part.get_name()=="slider")
+		reposition_child(slider, part);
+	else if(part.get_name()=="items")
 	{
-		const Sides &margin = items_part->get_margin();
+		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)
@@ -236,8 +173,7 @@ void List::reposition_items()
 				items[i]->set_visible(false);
 			else
 			{
-				Geometry igeom;
-				items[i]->autosize(igeom);
+				Geometry igeom = items[i]->get_geometry();
 				if(igeom.h+margin.bottom<=y)
 				{
 					items[i]->set_visible(true);
@@ -254,7 +190,43 @@ void List::reposition_items()
 				}
 			}
 		}
+
+		check_view_range();
+	}
+
+	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()
@@ -292,7 +264,7 @@ void List::slider_value_changed(double value)
 	if(max_scroll>0)
 	{
 		first = max_scroll-static_cast<unsigned>(value);
-		reposition_items();
+		rebuild();
 	}
 }
 
@@ -340,6 +312,8 @@ void List::DataObserver::cleared()
 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();
 }
@@ -352,7 +326,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 +349,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)
 {