X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flist.cpp;h=b9713422f11236fa86bc23a87a64f59523365569;hb=db2a069cd5ec4c8809c2ba6ddeec2ddcd32d49ef;hp=b712574d3992f9a0a5c3406837206e6ed1204542;hpb=3ed9c4e3e26dbdce188c32d2dc63c3f921f053e3;p=libs%2Fgltk.git

diff --git a/source/list.cpp b/source/list.cpp
index b712574..b971342 100644
--- a/source/list.cpp
+++ b/source/list.cpp
@@ -1,3 +1,4 @@
+#include <msp/core/raii.h>
 #include <msp/debug/demangle.h>
 #include <msp/gl/matrix.h>
 #include <msp/gl/meshbuilder.h>
@@ -39,6 +40,7 @@ void List::init()
 	first = 0;
 	max_scroll = 0;
 	view_size = 5;
+	ignore_slider_change = false;
 
 	observer = new DataObserver(*this);
 
@@ -55,7 +57,7 @@ List::~List()
 		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")
 	{
@@ -65,7 +67,8 @@ void List::autosize_special(const Part &part, Geometry &ageom)
 		unsigned total_h = 0;
 		for(unsigned i=0; i<items.size(); ++i)
 		{
-			const Geometry &igeom = items[i]->get_geometry();
+			Geometry igeom;
+			items[i]->autosize(igeom);
 			max_w = max(max_w, igeom.w);
 			if(view_size==0 || i<view_size)
 				total_h += igeom.h;
@@ -77,6 +80,8 @@ void List::autosize_special(const Part &part, Geometry &ageom)
 		ageom.w = max(ageom.w, max_w+margin.left+margin.right);
 		ageom.h = max(ageom.h, total_h+margin.top+margin.bottom);
 	}
+	else if(part.get_name()=="slider")
+		autosize_child(slider, part, ageom);
 }
 
 void List::set_data(ListData &d)
@@ -107,18 +112,19 @@ void List::set_data(ListData &d)
 
 void List::items_changed()
 {
-	check_view_range();
 	signal_autosize_changed.emit();
-	reposition_items();
+	rebuild();
 }
 
 List::Item *List::create_item(unsigned index)
 {
-	Item *item = 0;	
+	Item *item = 0;
 	if(item_factory)
 		item = item_factory->create_item(index);
 	else
 		item = new BasicItem(data->get_string(index));
+	if(static_cast<int>(index)==sel_index)
+		item->set_active(true);
 	add(*item);
 	item->autosize();
 	item->signal_autosize_changed.connect(sigc::bind(sigc::mem_fun(this, &List::item_autosize_changed), item));
@@ -141,11 +147,17 @@ 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 || (i<0 && sel_index<0))
+		return;
+
 	if(sel_index>=0)
 		items[sel_index]->set_active(false);
 	if(i<0)
+	{
 		sel_index = -1;
-	else if(i!=sel_index)
+		signal_selection_cleared.emit();
+	}
+	else
 	{
 		sel_index = i;
 		items[sel_index]->set_active(true);
@@ -153,80 +165,18 @@ void List::set_selected_index(int i)
 	}
 }
 
-void List::render_special(const Part &part, GL::Renderer &renderer) const
-{
-	if(part.get_name()=="items")
-	{
-		for(unsigned i=first; (i<items.size() && items[i]->is_visible()); ++i)
-			items[i]->render(renderer);
-	}
-	else if(part.get_name()=="slider")
-		slider.render(renderer);
-}
-
-void List::button_press(int x, int y, unsigned btn)
-{
-	Container::button_press(x, y, btn);
-	if(click_focus && btn==1)
-	{
-		for(unsigned i=first; (i<items.size() && items[i]->is_visible()); ++i)
-			if(click_focus==items[i])
-			{
-				set_selected_index(i);
-				break;
-			}
-	}
-}
-
-void List::on_geometry_change()
-{
-	reposition_slider();
-	reposition_items();
-
-	check_view_range();
-}
-
-void List::on_style_change()
-{
-	if(!style)
-		return;
-
-	reposition_slider();
-	reposition_items();
-
-	check_view_range();
-}
-
-void List::reposition_slider()
+void List::rebuild_special(const Part &part)
 {
-	if(!style)
-		return;
-
-	if(const Part *slider_part = style->get_part("slider"))
+	if(part.get_name()=="slider")
+		reposition_child(slider, part);
+	else if(part.get_name()=="items")
 	{
-		Geometry sgeom = slider_part->get_geometry();
-		slider_part->get_alignment().apply(sgeom, geom, slider_part->get_margin());
-		slider.set_geometry(sgeom);
-	}
-}
-
-void List::item_autosize_changed(Item *item)
-{
-	signal_autosize_changed.emit();
-	item->autosize();
-	reposition_items();
-}
-
-void List::reposition_items()
-{
-	if(!style)
-		return;
+		SetFlag flag(ignore_slider_change);
+		check_view_range();
 
-	if(const Part *items_part = style->get_part("items"))
-	{
-		const Sides &margin = items_part->get_margin();
-		unsigned w = geom.w-margin.left-margin.right;
-		unsigned y = geom.h-margin.top;
+		const Sides &margin = part.get_margin();
+		unsigned w = geom.w-min(geom.w, margin.left+margin.right);
+		unsigned y = geom.h-min(geom.h, margin.top);
 		for(unsigned i=0; i<items.size(); ++i)
 		{
 			if(i<first || !y)
@@ -251,31 +201,92 @@ void List::reposition_items()
 			}
 		}
 	}
+
+	Widget::rebuild_special(part);
 }
 
-void List::check_view_range()
+void List::render_special(const Part &part, GL::Renderer &renderer) const
+{
+	if(part.get_name()=="items")
+	{
+		for(unsigned i=first; (i<items.size() && items[i]->is_visible()); ++i)
+			items[i]->render(renderer);
+	}
+	else if(part.get_name()=="slider")
+		slider.render(renderer);
+}
+
+void List::button_press(int x, int y, unsigned btn)
+{
+	if(btn==4 || btn==5)
+	{
+		unsigned change = 3;
+		if(btn==4)
+		{
+			change = min(first, change);
+			slider.set_value(max_scroll-(first-change));
+		}
+		else if(btn==5)
+		{
+			change = min(max_scroll-first, change);
+			slider.set_value(max_scroll-(first+change));
+		}
+	}
+	else
+	{
+		Container::button_press(x, y, btn);
+		if(click_focus && btn==1)
+		{
+			for(unsigned i=first; (i<items.size() && items[i]->is_visible()); ++i)
+				if(click_focus==items[i])
+				{
+					set_selected_index(i);
+					break;
+				}
+		}
+	}
+}
+
+void List::item_autosize_changed(Item *item)
+{
+	item->autosize();
+	signal_autosize_changed.emit();
+	rebuild();
+}
+
+unsigned List::last_to_first(unsigned last) const
 {
 	if(!style)
-		return;
+		return last;
 
-	unsigned h = geom.h;
+	unsigned view_h = geom.h;
 	if(const Part *items_part = style->get_part("items"))
 	{
 		const Sides &margin = items_part->get_margin();
-		h -= margin.top+margin.bottom;
+		view_h -= margin.top+margin.bottom;
 	}
 
-	max_scroll = items.size();
-	for(unsigned i=items.size(); i-->0; )
+	unsigned items_h = 0;
+	for(unsigned i=last; i<items.size(); --i)
 	{
-		unsigned ih = items[i]->get_geometry().h;
-		if(ih<=h)
-		{
-			h -= ih;
-			--max_scroll;
-		}
+		items_h += items[i]->get_geometry().h;
+		if(items_h>view_h)
+			return min(i+1, last);
 	}
 
+	return 0;
+}
+
+void List::check_view_range()
+{
+	if(!style)
+		return;
+
+	if(items.empty())
+		max_scroll = 0;
+	else
+		max_scroll = last_to_first(items.size()-1);
+
 	if(first>max_scroll)
 		first = max_scroll;
 
@@ -285,10 +296,10 @@ void List::check_view_range()
 
 void List::slider_value_changed(double value)
 {
-	if(max_scroll>0)
+	if(max_scroll>0 && !ignore_slider_change)
 	{
 		first = max_scroll-static_cast<unsigned>(value);
-		reposition_items();
+		rebuild();
 	}
 }
 
@@ -314,6 +325,7 @@ void List::DataObserver::item_added(unsigned i)
 
 void List::DataObserver::item_removed(unsigned i)
 {
+	bool had_selection = (list.sel_index>=0);
 	if(list.sel_index>static_cast<int>(i))
 		--list.sel_index;
 	else if(list.sel_index==static_cast<int>(i))
@@ -322,6 +334,9 @@ void List::DataObserver::item_removed(unsigned i)
 	delete list.items[i];
 	list.items.erase(list.items.begin()+i);
 	list.items_changed();
+
+	if(had_selection && list.sel_index<0)
+		list.signal_selection_cleared.emit();
 }
 
 void List::DataObserver::cleared()
@@ -331,24 +346,29 @@ void List::DataObserver::cleared()
 		delete *i;
 	list.items.clear();
 	list.items_changed();
+
+	list.signal_selection_cleared.emit();
 }
 
 void List::DataObserver::refresh_item(unsigned i)
 {
 	delete list.items[i];
+	// Avoid stale pointer while create_item is executing
+	list.items[i] = 0;
 	list.items[i] = list.create_item(i);
 	list.items_changed();
 }
 
 
-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")
 	{
 		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();
+			Geometry cgeom;
+			(*i)->widget->autosize(cgeom);
 			ageom.w = max(ageom.w, cgeom.x+cgeom.w+margin.right);
 			ageom.h = max(ageom.h, cgeom.y+cgeom.h+margin.top);
 		}
@@ -370,6 +390,72 @@ void List::Item::render_special(const Part &part, GL::Renderer &renderer) const
 }
 
 
+void List::MultiColumnItem::check_widths(vector<unsigned> &widths) const
+{
+	if(widths.size()<children.size())
+		widths.resize(children.size(), 0);
+
+	unsigned n = 0;
+	for(list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i, ++n)
+	{
+		Geometry cgeom;
+		(*i)->widget->autosize(cgeom);
+		// TODO invent a better way to specify spacings
+		widths[n] = max(widths[n], cgeom.w+8);
+	}
+}
+
+void List::MultiColumnItem::set_widths(const vector<unsigned> &widths)
+{
+	if(!style)
+		return;
+
+	const Part *part = style->get_part("children");
+	if(!part)
+		return;
+
+	const Sides &margin = part->get_margin();
+	int x = margin.left;
+	unsigned n = 0;
+	for(list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i, ++n)
+	{
+		(*i)->widget->set_position(x, margin.bottom);
+		x += widths[n];
+	}
+}
+
+void List::MultiColumnItem::on_style_change()
+{
+	if(!style)
+		return;
+
+	for(std::list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
+		(*i)->widget->autosize();
+
+	vector<unsigned> widths;
+	List *list = static_cast<List *>(parent);
+	for(vector<Item *>::const_iterator i=list->items.begin(); i!=list->items.end(); ++i)
+		if(*i!=this)
+			if(MultiColumnItem *mci = dynamic_cast<MultiColumnItem *>(*i))
+				mci->check_widths(widths);
+
+	vector<unsigned> self_widths(widths);
+	check_widths(self_widths);
+	bool update_all = false;
+	for(unsigned i=0; (!update_all && i<widths.size() && i<self_widths.size()); ++i)
+		update_all = self_widths[i]>widths[i];
+
+	if(update_all)
+	{
+		for(vector<Item *>::const_iterator i=list->items.begin(); i!=list->items.end(); ++i)
+			if(MultiColumnItem *mci = dynamic_cast<MultiColumnItem *>(*i))
+				mci->set_widths(self_widths);
+	}
+
+	set_widths(self_widths);
+}
+
+
 List::BasicItem::BasicItem(const string &text):
 	label(text)
 {