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

diff --git a/source/list.cpp b/source/list.cpp
index 7be9363..f42d573 100644
--- a/source/list.cpp
+++ b/source/list.cpp
@@ -1,3 +1,4 @@
+#include <msp/core/raii.h>
 #include <msp/debug/demangle.h>
 #include <msp/gl/matrix.h>
 #include <msp/gl/meshbuilder.h>
@@ -39,6 +40,7 @@ void List::init()
 	first = 0;
 	max_scroll = 0;
 	view_size = 5;
+	ignore_slider_change = false;
 
 	observer = new DataObserver(*this);
 
@@ -78,6 +80,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 +112,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)
@@ -121,7 +124,8 @@ List::Item *List::create_item(unsigned index)
 	else
 		item = new BasicItem(data->get_string(index));
 	add(*item);
-	item->signal_autosize_changed.connect(sigc::mem_fun(this, &List::item_autosize_changed));
+	item->autosize();
+	item->signal_autosize_changed.connect(sigc::bind(sigc::mem_fun(this, &List::item_autosize_changed), item));
 	return item;
 }
 
@@ -156,77 +160,16 @@ 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()
+void List::rebuild_special(const Part &part)
 {
-	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"))
+	if(part.get_name()=="slider")
+		reposition_child(slider, part);
+	else if(part.get_name()=="items")
 	{
-		Geometry sgeom = slider_part->get_geometry();
-		slider_part->get_alignment().apply(sgeom, geom, slider_part->get_margin());
-		slider.set_geometry(sgeom);
-	}
-}
+		SetFlag flag(ignore_slider_change);
+		check_view_range();
 
-void List::item_autosize_changed()
-{
-	signal_autosize_changed.emit();
-	reposition_items();
-}
-
-void List::reposition_items()
-{
-	if(!style)
-		return;
-
-	if(const Part *items_part = style->get_part("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)
@@ -235,8 +178,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,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()
@@ -288,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();
 	}
 }
 
@@ -339,6 +315,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();
 }
@@ -436,7 +414,7 @@ void List::MultiColumnItem::on_style_change()
 				mci->set_widths(self_widths);
 	}
 	else
-		set_widths(widths);
+		set_widths(self_widths);
 }