X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flist.cpp;h=6496018380ffbb12411d4a24eb26caa50c9995cd;hb=1597579a34a8d87d4dea0a0cdc0895e6247b6126;hp=0f887f3a6641316a6610da9f403a4bc5abefb7f4;hpb=08b48157dc9ca5a4bd59d8eec9fa4e3bff8f0503;p=libs%2Fgltk.git

diff --git a/source/list.cpp b/source/list.cpp
index 0f887f3..6496018 100644
--- a/source/list.cpp
+++ b/source/list.cpp
@@ -35,8 +35,11 @@ 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;
@@ -155,12 +158,16 @@ void List::set_selected_index(int i)
 	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);
+		set_input_focus(items[focus_index]);
 		signal_item_selected.emit(sel_index);
 	}
 }
@@ -247,6 +254,52 @@ void List::button_press(int x, int y, unsigned btn)
 	}
 }
 
+void List::focus_in()
+{
+	if(focus_index<0)
+		focus_index = sel_index;
+
+	if(focus_index>=0)
+	{
+		scroll_to_focus();
+		set_input_focus(items[focus_index]);
+	}
+}
+
+bool List::navigate(Navigation nav)
+{
+	if(nav==NAV_UP)
+	{
+		if(focus_index<0 && !items.empty())
+			focus_index = items.size()-1;
+		else if(focus_index>0)
+			--focus_index;
+		else
+			return false;
+
+		scroll_to_focus();
+		set_input_focus(items[focus_index]);
+	}
+	else if(nav==NAV_DOWN)
+	{
+		if(focus_index<0 && !items.empty())
+			focus_index = 0;
+		else if(static_cast<unsigned>(focus_index+1)<items.size())
+			++focus_index;
+		else
+			return false;
+
+		scroll_to_focus();
+		set_input_focus(items[focus_index]);
+	}
+	else if(nav==NAV_ACTIVATE)
+		set_selected_index(focus_index);
+	else
+		return false;
+
+	return true;
+}
+
 void List::item_autosize_changed(Item *item)
 {
 	item->autosize();
@@ -254,29 +307,39 @@ void List::item_autosize_changed(Item *item)
 	rebuild();
 }
 
-void List::check_view_range()
+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;
 
@@ -284,6 +347,17 @@ 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 && !ignore_slider_change)
@@ -293,6 +367,14 @@ void List::slider_value_changed(double value)
 	}
 }
 
+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)
@@ -305,8 +387,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);
@@ -316,10 +398,8 @@ 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))
-		list.sel_index = -1;
+	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);
@@ -332,6 +412,7 @@ void List::DataObserver::item_removed(unsigned i)
 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();