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

diff --git a/source/list.cpp b/source/list.cpp
index a5928ec..a9cbcc1 100644
--- a/source/list.cpp
+++ b/source/list.cpp
@@ -44,6 +44,9 @@ void List::init()
 	max_scroll = 0;
 	view_size = 5;
 	ignore_slider_change = false;
+	dragging = false;
+	drag_start_x = 0;
+	drag_start_y = 0;
 
 	observer = new DataObserver(*this);
 
@@ -173,6 +176,13 @@ void List::set_selected_index(int i)
 	}
 }
 
+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")
@@ -244,19 +254,67 @@ void List::button_press(int x, int y, unsigned btn)
 	{
 		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)
 		{
-			for(unsigned i=first; (i<items.size() && items[i]->is_visible()); ++i)
-				if(click_focus==items[i])
-				{
-					set_selected_index(i);
-					break;
-				}
+			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)
+			{
+				drag_start_y -= item_h;
+				slider.set_value(max_scroll-(first-1));
+			}
 		}
 	}
 }
 
 void List::focus_in()
 {
+	Container::focus_in();
 	if(focus_index>=0 && items[focus_index]->is_visible())
 		set_input_focus(items[focus_index]);
 	else