Don't drop selection when dragging from selected item

SVN revision: 50841

diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index b070312..683c0a0 100644 (file)
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -239,7 +239,8 @@ _mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event_inf
        if (!item->wd->on_hold) 
          {
             item->wd->on_hold = EINA_TRUE;
-            _item_unselect(item);
+             if (!item->wd->wasselected)
+               _item_unselect(item);
          }
      }
    if ((item->dragging) && (item->down))
@@ -282,9 +283,8 @@ _mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event_inf
             ecore_timer_del(item->long_timer);
             item->long_timer = NULL;
          }
-       if (item->wd->wasselected)
+       if (!item->wd->wasselected)
          _item_unselect(item);
-       item->wd->wasselected = 0;
        if (dy < 0)
          {
             if (ady > adx)

diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index f435d09..c71d4a8 100644 (file)
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -590,7 +590,8 @@ _mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event_inf
        if (!it->wd->on_hold)
          {
             it->wd->on_hold = EINA_TRUE;
-            _item_unselect(it);
+             if (!it->wd->wasselected)
+               _item_unselect(it);
          }
      }
    if ((it->dragging) && (it->down))
@@ -635,7 +636,6 @@ _mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event_inf
           }
         if (!it->wd->wasselected)
           _item_unselect(it);
-        it->wd->wasselected = 0;
         if (dy < 0)
           {
              if (ady > adx)
@@ -688,7 +688,6 @@ _mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event_inf
    Evas_Coord x, y;
 
    if (ev->button != 1) return;
-   Widget_Data *wd = elm_widget_data_get(it->wd->obj);
 
    it->down = 1;
    it->dragging  = 0;
@@ -704,7 +703,7 @@ _mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event_inf
      evas_object_smart_callback_call(it->wd->obj, "clicked", it);
    if (it->long_timer) ecore_timer_del(it->long_timer);
    if (it->realized)
-     it->long_timer = ecore_timer_add(wd->longpress_timeout, _long_press, it);
+     it->long_timer = ecore_timer_add(it->wd->longpress_timeout, _long_press, it);
    else
      it->long_timer = NULL;
 }

diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 3f37baa..fd41a28 100644 (file)
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -368,7 +368,8 @@ _mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void
                   ecore_timer_del(it->long_timer);
                   it->long_timer = NULL;
                }
-            _item_unselect(it);
+             if (!wd->wasselected)
+               _item_unselect(it);
          }
      }
 }