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

diff --git a/source/list.cpp b/source/list.cpp
index eaab9e0..653a40c 100644
--- a/source/list.cpp
+++ b/source/list.cpp
@@ -65,7 +65,6 @@ 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();
 			max_w = max(max_w, igeom.w);
 			if(view_size==0 || i<view_size)
@@ -100,7 +99,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 +114,15 @@ 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->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)
@@ -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,13 @@ void List::reposition_slider()
 	}
 }
 
+void List::item_autosize_changed(Item *item)
+{
+	signal_autosize_changed.emit();
+	item->autosize();
+	reposition_items();
+}
+
 void List::reposition_items()
 {
 	if(!style)
@@ -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();
 }