X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flist.cpp;h=461d5e425c3076426f8ad51029ee971825cf396f;hb=707b59d45ae50b69c94918f8f74313283b304597;hp=fbb711e146cab0d1fba0187dd8fdcf743896de60;hpb=3f77f3542a6405fd832ababe48b950d1a65b00ed;p=libs%2Fgltk.git

diff --git a/source/list.cpp b/source/list.cpp
index fbb711e..461d5e4 100644
--- a/source/list.cpp
+++ b/source/list.cpp
@@ -1,3 +1,4 @@
+#include <msp/debug/demangle.h>
 #include <msp/gl/matrix.h>
 #include <msp/gl/meshbuilder.h>
 #include "graphic.h"
@@ -12,6 +13,11 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
+incompatible_data::incompatible_data(const type_info &ti):
+	logic_error("expected "+Debug::demangle(ti.name()))
+{ }
+
+
 List::List():
 	data(new BasicListData<string>),
 	own_data(true)
@@ -28,6 +34,7 @@ List::List(ListData &d):
 
 void List::init()
 {
+	item_factory = 0;
 	sel_index = -1;
 	first = 0;
 	max_scroll = 0;
@@ -42,12 +49,13 @@ void List::init()
 
 List::~List()
 {
+	delete item_factory;
 	delete observer;
 	if(own_data)
 		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")
 	{
@@ -57,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)
@@ -74,6 +81,9 @@ void List::autosize_special(const Part &part, Geometry &ageom)
 
 void List::set_data(ListData &d)
 {
+	if(item_factory)
+		item_factory->set_data(d);
+
 	delete observer;
 	if(own_data)
 		delete data;
@@ -89,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);
 	}
 
@@ -105,7 +114,15 @@ void List::items_changed()
 
 List::Item *List::create_item(unsigned index)
 {
-	return new BasicItem(data->get_string(index));
+	Item *item = 0;	
+	if(item_factory)
+		item = item_factory->create_item(index);
+	else
+		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)
@@ -121,14 +138,17 @@ void List::set_view_all()
 
 void List::set_selected_index(int i)
 {
-	if(i>static_cast<int>(data->size()))
+	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);
@@ -193,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)
@@ -284,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();
 }
@@ -318,7 +344,7 @@ 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")
 	{