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

diff --git a/source/list.cpp b/source/list.cpp
index 1b26a3f..b971342 100644
--- a/source/list.cpp
+++ b/source/list.cpp
@@ -118,11 +118,13 @@ void List::items_changed()
 
 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));
@@ -145,13 +147,16 @@ 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;
+		signal_selection_cleared.emit();
+	}
 	else
 	{
 		sel_index = i;
@@ -213,15 +218,32 @@ 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])
-			{
-				set_selected_index(i);
-				break;
-			}
+		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;
+				}
+		}
 	}
 }
 
@@ -232,29 +254,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;
 
@@ -293,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))
@@ -301,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()
@@ -310,6 +346,8 @@ void List::DataObserver::cleared()
 		delete *i;
 	list.items.clear();
 	list.items_changed();
+
+	list.signal_selection_cleared.emit();
 }
 
 void List::DataObserver::refresh_item(unsigned i)