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

diff --git a/source/list.cpp b/source/list.cpp
index 378bf70..c74af90 100644
--- a/source/list.cpp
+++ b/source/list.cpp
@@ -31,6 +31,7 @@ void List::init()
 	sel_index = -1;
 	first = 0;
 	max_scroll = 0;
+	view_size = 5;
 
 	observer = new DataObserver(*this);
 
@@ -47,11 +48,6 @@ List::~List()
 }
 
 void List::autosize()
-{
-	autosize_rows(5);
-}
-
-void List::autosize_rows(unsigned n)
 {
 	if(!style)
 		return;
@@ -64,16 +60,17 @@ 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(view_size==0 || i<view_size)
+				total_h += igeom.h;
 		}
 
-		if(items.size()<n)
-			total_h = total_h*n/items.size();
+		if(!items.empty() && items.size()<view_size)
+			total_h = total_h*view_size/items.size();
 
 		geom.w = max(geom.w, max_w+margin.left+margin.right);
 		geom.h = max(geom.h, total_h+margin.top+margin.bottom);
@@ -83,11 +80,6 @@ void List::autosize_rows(unsigned n)
 	rebuild();
 }
 
-void List::autosize_all()
-{
-	autosize_rows(data->size());
-}
-
 void List::set_data(ListData &d)
 {
 	delete observer;
@@ -113,6 +105,17 @@ List::Item *List::create_item(unsigned index)
 	return new BasicItem(data->get_string(index));
 }
 
+void List::set_view_size(unsigned s)
+{
+	view_size = s;
+	signal_autosize_changed.emit();
+}
+
+void List::set_view_all()
+{
+	set_view_size(0);
+}
+
 void List::set_selected_index(int i)
 {
 	if(i>static_cast<int>(data->size()))
@@ -310,13 +313,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 +364,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