X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flist.cpp;h=a4550c4ee9ad220dfd22336657894b9cca13de9a;hb=729cb06f85e2888a7ac1e72375380257936106c9;hp=eaab9e0e5ed8857a0bdaea7e779374577efbf7da;hpb=74934c6f7a6fd0f9e9bf11eeb9f33cf9279bf471;p=libs%2Fgltk.git

diff --git a/source/list.cpp b/source/list.cpp
index eaab9e0..a4550c4 100644
--- a/source/list.cpp
+++ b/source/list.cpp
@@ -55,7 +55,7 @@ List::~List()
 		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")
 	{
@@ -65,8 +65,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;
@@ -100,7 +100,6 @@ void List::set_data(ListData &d)
 	for(unsigned i=0; i<n_items; ++i)
 	{
 		Item *item = create_item(i);
-		add(*item);
 		items.push_back(item);
 	}
 
@@ -116,10 +115,14 @@ void List::items_changed()
 
 List::Item *List::create_item(unsigned index)
 {
+	Item *item = 0;	
 	if(item_factory)
-		return item_factory->create_item(index);
+		item = item_factory->create_item(index);
 	else
-		return new BasicItem(data->get_string(index));
+		item = new BasicItem(data->get_string(index));
+	add(*item);
+	item->signal_autosize_changed.connect(sigc::mem_fun(this, &List::item_autosize_changed));
+	return item;
 }
 
 void List::set_view_size(unsigned s)
@@ -138,11 +141,14 @@ void List::set_selected_index(int i)
 	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);
@@ -207,6 +213,12 @@ void List::reposition_slider()
 	}
 }
 
+void List::item_autosize_changed()
+{
+	signal_autosize_changed.emit();
+	reposition_items();
+}
+
 void List::reposition_items()
 {
 	if(!style)
@@ -215,15 +227,16 @@ void List::reposition_items()
 	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;
+		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();
+				Geometry igeom;
+				items[i]->autosize(igeom);
 				if(igeom.h+margin.bottom<=y)
 				{
 					items[i]->set_visible(true);
@@ -298,7 +311,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();
 }
@@ -332,14 +344,15 @@ void List::DataObserver::refresh_item(unsigned i)
 }
 
 
-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);
 		}