Implement touch interactions for List

It wasn't working on touchscreens at all because the touch events were
passed to the list items by Container and not converted into mouse events
for the list itself to process.

diff --git a/source/list.cpp b/source/list.cpp
index a5928ec91a76793d453ef67cba2bd062d89165be..5a9f749fd0363b974ee1bfab98c37f37264a4354 100644 (file)
--- 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,13 +254,60 @@ 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));
+                       }
                }
        }
 }

diff --git a/source/list.h b/source/list.h
index 5a95b085ae64c9d22837fea608d65af988135578..c0ea6d25a5a0b6353fd36bb45248f02659624610 100644 (file)
--- a/source/list.h
+++ b/source/list.h
@@ -143,6 +143,9 @@ private:
        unsigned max_scroll;
        unsigned view_size;
        bool ignore_slider_change;
+       bool dragging;
+       int drag_start_x;
+       int drag_start_y;
 
        VSlider slider;
        std::vector<Item *> items;
@@ -184,13 +187,17 @@ public:
 
        void set_selected_index(int);
        int get_selected_index() const { return sel_index; }
-
 private:
+       void set_selected_item(Widget *);
+
        virtual void rebuild_special(const Part &);
        virtual void render_special(const Part &, GL::Renderer &) const;
 
 public:
        virtual void button_press(int, int, unsigned);
+       virtual void touch_press(int, int, unsigned);
+       virtual void touch_release(int, int, unsigned);
+       virtual void touch_motion(int, int, unsigned);
        virtual void focus_in();
        virtual bool navigate(Navigation);
 private: