X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flist.cpp;h=ec3f9942d458eece47a62f4eb2ee2b233c5d54b7;hb=a2dde70bd7a55902d6e7f7634081aa9ff1c1410a;hp=710d1fc6fa7cf7c05e2fe88e5c6349aa018cf298;hpb=768c65e13861f72929290ac2513df9975579e543;p=libs%2Fgltk.git

diff --git a/source/list.cpp b/source/list.cpp
index 710d1fc..ec3f994 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);
 
@@ -46,21 +47,11 @@ List::~List()
 		delete data;
 }
 
-void List::autosize()
+void List::autosize_special(const Part &part, Geometry &ageom)
 {
-	autosize_rows(5);
-}
-
-void List::autosize_rows(unsigned n)
-{
-	if(!style)
-		return;
-
-	Widget::autosize();
-
-	if(const Part *items_part = style->get_part("items"))
+	if(part.get_name()=="items")
 	{
-		const Sides &margin = items_part->get_margin();
+		const Sides &margin = part.get_margin();
 
 		unsigned max_w = 0;
 		unsigned total_h = 0;
@@ -69,24 +60,16 @@ void List::autosize_rows(unsigned n)
 			items[i]->autosize();
 			const Geometry &igeom = items[i]->get_geometry();
 			max_w = max(max_w, igeom.w);
-			if(i<n)
+			if(view_size==0 || i<view_size)
 				total_h += igeom.h;
 		}
 
-		if(!items.empty() && 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);
+		ageom.w = max(ageom.w, max_w+margin.left+margin.right);
+		ageom.h = max(ageom.h, total_h+margin.top+margin.bottom);
 	}
-
-	check_view_range();
-	rebuild();
-}
-
-void List::autosize_all()
-{
-	autosize_rows(data->size());
 }
 
 void List::set_data(ListData &d)
@@ -99,6 +82,17 @@ void List::set_data(ListData &d)
 	own_data = false;
 	observer = new DataObserver(*this);
 
+	for(vector<Item *>::iterator i=items.begin(); i!=items.end(); ++i)
+		delete *i;
+	items.clear();
+	unsigned n_items = data->size();
+	for(unsigned i=0; i<n_items; ++i)
+	{
+		Item *item = create_item(i);
+		add(*item);
+		items.push_back(item);
+	}
+
 	items_changed();
 }
 
@@ -114,6 +108,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()))
@@ -123,7 +128,7 @@ void List::set_selected_index(int i)
 		items[sel_index]->set_active(false);
 	if(i<0)
 		sel_index = -1;
-	else
+	else if(i!=sel_index)
 	{
 		sel_index = i;
 		items[sel_index]->set_active(true);
@@ -311,18 +316,16 @@ void List::DataObserver::refresh_strings()
 }
 
 
-void List::Item::autosize()
+void List::Item::autosize_special(const Part &part, Geometry &ageom)
 {
-	Widget::autosize();
-
-	if(const Part *part = style->get_part("children"))
+	if(part.get_name()=="children")
 	{
-		const Sides &margin = part->get_margin();
+		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();
-			geom.w = max(geom.w, cgeom.x+cgeom.w+margin.right);
-			geom.h = max(geom.h, cgeom.y+cgeom.h+margin.top);
+			ageom.w = max(ageom.w, cgeom.x+cgeom.w+margin.right);
+			ageom.h = max(ageom.h, cgeom.y+cgeom.h+margin.top);
 		}
 	}
 }
@@ -366,6 +369,7 @@ List::Loader::Loader(List &l):
 	DataFile::DerivedObjectLoader<List, Widget::Loader>(l)
 {
 	add("item", &Loader::item);
+	add("view_size", &List::view_size);
 }
 
 void List::Loader::item(const string &v)