X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flist.cpp;h=710d1fc6fa7cf7c05e2fe88e5c6349aa018cf298;hb=319cde3c06181ba1c3619567525002926d8b4889;hp=378bf707c1a7d702f2192d50b0da8cd2ea70d9bc;hpb=d75275638b2dfeb5e346c42ec2c4498da3671042;p=libs%2Fgltk.git

diff --git a/source/list.cpp b/source/list.cpp
index 378bf70..710d1fc 100644
--- a/source/list.cpp
+++ b/source/list.cpp
@@ -64,15 +64,16 @@ void List::autosize_rows(unsigned n)
 
 		unsigned max_w = 0;
 		unsigned total_h = 0;
-		for(unsigned i=0; (i<n && i<items.size()); ++i)
+		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);
-			total_h += igeom.h;
+			if(i<n)
+				total_h += igeom.h;
 		}
 
-		if(items.size()<n)
+		if(!items.empty() && items.size()<n)
 			total_h = total_h*n/items.size();
 
 		geom.w = max(geom.w, max_w+margin.left+margin.right);
@@ -310,13 +311,6 @@ void List::DataObserver::refresh_strings()
 }
 
 
-List::Loader::Loader(List &l):
-	Widget::Loader(l)
-{
-	add("item", &Loader::item);
-}
-
-
 void List::Item::autosize()
 {
 	Widget::autosize();
@@ -368,9 +362,15 @@ void List::BasicItem::on_style_change()
 }
 
 
+List::Loader::Loader(List &l):
+	DataFile::DerivedObjectLoader<List, Widget::Loader>(l)
+{
+	add("item", &Loader::item);
+}
+
 void List::Loader::item(const string &v)
 {
-	dynamic_cast<BasicListData<string> &>(*dynamic_cast<List &>(obj).data).append(v);
+	dynamic_cast<BasicListData<string> &>(*obj.data).append(v);
 }
 
 } // namespace GLtk