X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flist.cpp;h=a9cbcc1c5f02af4080ca895f18525dfcea61af1e;hb=35f6cfcfb7a7278251d890988fdf6a6bbf793ef8;hp=042eb20ab7b85dbd052d3274351b03287c09614e;hpb=1afb4f8d6379ad1bf832692fbfedef9714ee3ff5;p=libs%2Fgltk.git

diff --git a/source/list.cpp b/source/list.cpp
index 042eb20..a9cbcc1 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>
@@ -34,11 +35,18 @@ List::List(ListData &d):
 
 void List::init()
 {
+	input_type = INPUT_NAVIGATION;
+
 	item_factory = 0;
 	sel_index = -1;
+	focus_index = -1;
 	first = 0;
 	max_scroll = 0;
 	view_size = 5;
+	ignore_slider_change = false;
+	dragging = false;
+	drag_start_x = 0;
+	drag_start_y = 0;
 
 	observer = new DataObserver(*this);
 
@@ -110,20 +118,22 @@ 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->signal_autosize_changed.connect(sigc::mem_fun(this, &List::item_autosize_changed));
+	item->autosize();
+	item->signal_autosize_changed.connect(sigc::bind(sigc::mem_fun(this, &List::item_autosize_changed), item));
 	return item;
 }
 
@@ -143,25 +153,73 @@ 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)
+	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;
+		focus_index = -1;
+		set_input_focus(0);
+		signal_selection_cleared.emit();
+	}
 	else
 	{
 		sel_index = i;
+		focus_index = i;
 		items[sel_index]->set_active(true);
+		if(state&FOCUS)
+			set_input_focus(items[focus_index]);
 		signal_item_selected.emit(sel_index);
 	}
 }
 
+void List::set_selected_item(Widget *item)
+{
+	for(unsigned i=first; (i<items.size() && items[i]->is_visible()); ++i)
+		if(item==items[i])
+			return set_selected_index(i);
+}
+
 void List::rebuild_special(const Part &part)
 {
 	if(part.get_name()=="slider")
 		reposition_child(slider, part);
+	else if(part.get_name()=="items")
+	{
+		SetFlag flag(ignore_slider_change);
+		check_view_range();
+
+		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)
+				items[i]->set_visible(false);
+			else
+			{
+				Geometry igeom = items[i]->get_geometry();
+				if(igeom.h+margin.bottom<=y)
+				{
+					items[i]->set_visible(true);
+					y -= igeom.h;
+					igeom.x = margin.left;
+					igeom.y = y;
+					igeom.w = w;
+					items[i]->set_geometry(igeom);
+				}
+				else
+				{
+					items[i]->set_visible(false);
+					y = 0;
+				}
+			}
+		}
+	}
+
 	Widget::rebuild_special(part);
 }
 
@@ -178,76 +236,155 @@ void List::render_special(const Part &part, GL::Renderer &renderer) const
 
 void List::button_press(int x, int y, unsigned btn)
 {
-	Container::button_press(x, y, btn);
-	if(click_focus && btn==1)
+	if(btn==4 || btn==5)
 	{
-		for(unsigned i=first; (i<items.size() && items[i]->is_visible()); ++i)
-			if(click_focus==items[i])
+		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)
+			set_selected_item(click_focus);
+	}
+}
+
+void List::touch_press(int x, int y, unsigned finger)
+{
+	if(finger==0)
+	{
+		dragging = true;
+		drag_start_x = x;
+		drag_start_y = y;
+	}
+}
+
+void List::touch_release(int x, int y, unsigned finger)
+{
+	if(finger==0)
+	{
+		int dx = x-drag_start_x;
+		int dy = y-drag_start_y;
+		if(dx*dx+dy*dy<25)
+		{
+			Container::touch_press(drag_start_x, drag_start_y, finger);
+			if(touch_focus)
+				set_selected_item(touch_focus);
+			Container::touch_motion(x, y, finger);
+			Container::touch_release(x, y, finger);
+		}
+		dragging = false;
+	}
+}
+
+void List::touch_motion(int, int y, unsigned finger)
+{
+	if(finger==0 && !items.empty() && dragging)
+	{
+		int dy = y-drag_start_y;
+		if(dy>0 && first<max_scroll)
+		{
+			int item_h = items[first]->get_geometry().h;
+			if(dy>item_h)
+			{
+				drag_start_y += item_h;
+				slider.set_value(max_scroll-(first+1));
+			}
+		}
+		else if(dy<0 && first>0)
+		{
+			int item_h = items[first-1]->get_geometry().h;
+			if(-dy>item_h)
 			{
-				set_selected_index(i);
-				break;
+				drag_start_y -= item_h;
+				slider.set_value(max_scroll-(first-1));
 			}
+		}
 	}
 }
 
-void List::on_geometry_change()
+void List::focus_in()
 {
-	reposition_items();
-
-	check_view_range();
+	Container::focus_in();
+	if(focus_index>=0 && items[focus_index]->is_visible())
+		set_input_focus(items[focus_index]);
+	else
+	{
+		if(sel_index>=0 && items[sel_index]->is_visible())
+			set_focus_index(sel_index);
+		else if(!items.empty())
+			set_focus_index(first);
+	}
 }
 
-void List::on_style_change()
+bool List::navigate(Navigation nav)
 {
-	if(!style)
-		return;
+	if(nav==NAV_UP && !items.empty())
+	{
+		if(focus_index>0)
+			set_focus_index(focus_index-1);
+	}
+	else if(nav==NAV_DOWN && !items.empty())
+	{
+		if(static_cast<unsigned>(focus_index+1)<items.size())
+			set_focus_index(focus_index+1);
+	}
+	else if(nav==NAV_ACTIVATE)
+		set_selected_index(focus_index);
+	else
+		return false;
 
-	reposition_items();
+	return true;
+}
 
-	check_view_range();
+void List::set_focus_index(int i)
+{
+	focus_index = i;
+	if(focus_index>=0)
+	{
+		scroll_to_focus();
+		if(state&FOCUS)
+			set_input_focus(items[focus_index]);
+	}
 }
 
-void List::item_autosize_changed()
+void List::item_autosize_changed(Item *item)
 {
+	item->autosize();
 	signal_autosize_changed.emit();
-	reposition_items();
+	rebuild();
 }
 
-void List::reposition_items()
+unsigned List::last_to_first(unsigned last) const
 {
 	if(!style)
-		return;
+		return last;
 
+	unsigned view_h = geom.h;
 	if(const Part *items_part = style->get_part("items"))
 	{
 		const Sides &margin = items_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)
-				items[i]->set_visible(false);
-			else
-			{
-				Geometry igeom;
-				items[i]->autosize(igeom);
-				if(igeom.h+margin.bottom<=y)
-				{
-					items[i]->set_visible(true);
-					y -= igeom.h;
-					igeom.x = margin.left;
-					igeom.y = y;
-					igeom.w = w;
-					items[i]->set_geometry(igeom);
-				}
-				else
-				{
-					items[i]->set_visible(false);
-					y = 0;
-				}
-			}
-		}
+		view_h -= margin.top+margin.bottom;
+	}
+
+	unsigned items_h = 0;
+	for(unsigned i=last; i<items.size(); --i)
+	{
+		items_h += items[i]->get_geometry().h;
+		if(items_h>view_h)
+			return min(i+1, last);
 	}
+
+	return 0;
 }
 
 void List::check_view_range()
@@ -255,23 +392,10 @@ void List::check_view_range()
 	if(!style)
 		return;
 
-	unsigned h = geom.h;
-	if(const Part *items_part = style->get_part("items"))
-	{
-		const Sides &margin = items_part->get_margin();
-		h -= margin.top+margin.bottom;
-	}
-
-	max_scroll = items.size();
-	for(unsigned i=items.size(); i-->0; )
-	{
-		unsigned ih = items[i]->get_geometry().h;
-		if(ih<=h)
-		{
-			h -= ih;
-			--max_scroll;
-		}
-	}
+	if(items.empty())
+		max_scroll = 0;
+	else
+		max_scroll = last_to_first(items.size()-1);
 
 	if(first>max_scroll)
 		first = max_scroll;
@@ -280,15 +404,34 @@ void List::check_view_range()
 	slider.set_value(max_scroll-first);
 }
 
+void List::scroll_to_focus()
+{
+	if(focus_index<0 || items[focus_index]->is_visible())
+		return;
+
+	if(static_cast<unsigned>(focus_index)<first)
+		slider.set_value(max_scroll-focus_index);
+	else
+		slider.set_value(max_scroll-last_to_first(focus_index));
+}
+
 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();
 	}
 }
 
+void List::adjust_index(int &index, int pos, int change)
+{
+	if(index>pos)
+		index += change;
+	else if(index==pos)
+		index = (change>0 ? index+change : -1);
+}
+
 
 List::DataObserver::DataObserver(List &l):
 	list(l)
@@ -301,8 +444,8 @@ List::DataObserver::DataObserver(List &l):
 
 void List::DataObserver::item_added(unsigned i)
 {
-	if(list.sel_index>=static_cast<int>(i))
-		++list.sel_index;
+	adjust_index(list.sel_index, i, 1);
+	adjust_index(list.focus_index, i, 1);
 
 	Item *item = list.create_item(i);
 	list.items.insert(list.items.begin()+i, item);
@@ -311,28 +454,35 @@ void List::DataObserver::item_added(unsigned i)
 
 void List::DataObserver::item_removed(unsigned i)
 {
-	if(list.sel_index>static_cast<int>(i))
-		--list.sel_index;
-	else if(list.sel_index==static_cast<int>(i))
-		list.sel_index = -1;
+	bool had_selection = (list.sel_index>=0);
+	adjust_index(list.sel_index, i, -1);
+	adjust_index(list.focus_index, i, -1);
 
 	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()
 {
 	list.sel_index = -1;
+	list.focus_index = -1;
 	for(vector<Item *>::iterator i=list.items.begin(); i!=list.items.end(); ++i)
 		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();
 }
@@ -429,8 +579,8 @@ void List::MultiColumnItem::on_style_change()
 			if(MultiColumnItem *mci = dynamic_cast<MultiColumnItem *>(*i))
 				mci->set_widths(self_widths);
 	}
-	else
-		set_widths(self_widths);
+
+	set_widths(self_widths);
 }