slight change in drag events vs scrolling on_hold to fix small "distance

race" issue.

SVN revision: 46505

diff --git a/src/bin/test_genlist.c b/src/bin/test_genlist.c
index 802bcbf74949ce9a1d1c4990e8cdaf4f9755bc12..5f5807ef57c02aa1070d5a8279619d727997d1dc 100644 (file)
--- a/src/bin/test_genlist.c
+++ b/src/bin/test_genlist.c
@@ -872,6 +872,12 @@ item_drag_stop(void *data, Evas_Object *obj, void *event_info)
    printf("drag stop\n");
 }
 
+static void
+item_longpress(void *data, Evas_Object *obj, void *event_info)
+{
+   printf("longpress\n");
+}
+
 void
 test_genlist5(void *data, Evas_Object *obj, void *event_info)
 {
@@ -926,6 +932,7 @@ test_genlist5(void *data, Evas_Object *obj, void *event_info)
    evas_object_smart_callback_add(gl, "drag,start,right", item_drag_right, NULL);
    evas_object_smart_callback_add(gl, "drag", item_drag, NULL);
    evas_object_smart_callback_add(gl, "drag,stop", item_drag_stop, NULL);
+   evas_object_smart_callback_add(gl, "longpressed", item_longpress, NULL);
 
    bx2 = elm_box_add(win);
    elm_box_horizontal_set(bx2, 1);

diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 9ca5657a60f1504f6d061ca4aa460b8cc28d7f9e..d7264f428513944d58fd5dda4f96822c73ce4b82 100644 (file)
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -477,23 +477,23 @@ _mouse_move(void *data, Evas *evas, Evas_Object *obj, void *event_info)
             _item_unselect(it);
          }
      }
-   if ((!it->down) || (it->wd->on_hold) || (it->wd->longpressed))
+   if ((it->dragging) && (it->down))
      {
         if (it->long_timer)
           {
              ecore_timer_del(it->long_timer);
              it->long_timer = NULL;
           }
+        evas_object_smart_callback_call(it->wd->obj, "drag", it);
         return;
      }
-   if (it->dragging)
+   if ((!it->down)/* || (it->wd->on_hold)*/ || (it->wd->longpressed))
      {
         if (it->long_timer)
           {
              ecore_timer_del(it->long_timer);
              it->long_timer = NULL;
           }
-        evas_object_smart_callback_call(it->wd->obj, "drag", it);
         return;
      }
    if (!it->display_only)
@@ -577,6 +577,7 @@ _mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info)
    evas_object_geometry_get(obj, &x, &y, NULL, NULL);
    it->dx = ev->canvas.x - x;
    it->dy = ev->canvas.y - y;
+   it->wd->longpressed = EINA_FALSE;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) it->wd->on_hold = EINA_TRUE;
    else it->wd->on_hold = EINA_FALSE;
    it->wd->wasselected = it->selected;
@@ -599,6 +600,7 @@ _mouse_up(void *data, Evas *evas, Evas_Object *obj, void *event_info)
    it->down = 0;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) it->wd->on_hold = EINA_TRUE;
    else it->wd->on_hold = EINA_FALSE;
+   it->wd->longpressed = EINA_FALSE;
    if (it->long_timer)
      {
         ecore_timer_del(it->long_timer);
@@ -612,7 +614,6 @@ _mouse_up(void *data, Evas *evas, Evas_Object *obj, void *event_info)
      }
    if (it->wd->on_hold)
      {
-        it->wd->longpressed = EINA_FALSE;
        it->wd->on_hold = EINA_FALSE;
        return;
      }

diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 080eb45b18fd871235e12d703aac4c892b3eb192..3074906640c9e471c869179879077cf9c537317e 100644 (file)
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -398,6 +398,7 @@ _mouse_up(void *data, Evas *evas, Evas_Object *obj, void *event_info)
    if (ev->button != 1) return;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) wd->on_hold = EINA_TRUE;
    else wd->on_hold = EINA_FALSE;
+   wd->longpressed = EINA_FALSE;
    if (it->long_timer)
      {
         ecore_timer_del(it->long_timer);
@@ -410,7 +411,6 @@ _mouse_up(void *data, Evas *evas, Evas_Object *obj, void *event_info)
      }
    if (wd->longpressed)
      {
-        wd->longpressed = EINA_FALSE;
         if (!wd->wasselected) _item_unselect(it);
         wd->wasselected = 0;
         return;