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

diff --git a/source/list.cpp b/source/list.cpp
index 83af932..0f887f3 100644
--- a/source/list.cpp
+++ b/source/list.cpp
@@ -123,6 +123,8 @@ List::Item *List::create_item(unsigned index)
 		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;
+				}
+		}
 	}
 }
 
@@ -293,6 +315,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 +324,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 +336,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)