[Gengrid/List/Genlist] "clicked" callback name change to "clicked,double" on upstream.

diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index e56a5be..dbf1cd1 100644 (file)
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -971,7 +971,7 @@ extern "C" {
     *
     * selected - User has selected a item.
     * unselected - User has unselected a item.
-    * clicked - User has double-clicked a item.
+    * clicked,double - User has double-clicked a item.
     * realized - An evas object for a item was built.
     * unrealized - An evas object for a item was deleted.
     * changed - An item has been added, removed, resized or moved,
@@ -1677,7 +1677,7 @@ extern "C" {
    EAPI void             elm_list_scroller_policy_set(Evas_Object *obj, Elm_Scroller_Policy policy_h, Elm_Scroller_Policy policy_v) EINA_ARG_NONNULL(1);
    EAPI void             elm_list_scroller_policy_get(const Evas_Object *obj, Elm_Scroller_Policy *policy_h, Elm_Scroller_Policy *policy_v) EINA_ARG_NONNULL(1);
   /* smart callbacks called:
-    * "clicked" - when the user double-clicked an item
+    * "clicked,double" - when the user double-clicked an item
     * "selected" - when the user selected an item
     * "unselected" - when the user selected an item
     * "longpressed" - an item in the hoversel list is long-pressed

diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index 3ceddce..1b1d3c0 100644 (file)
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -12,7 +12,7 @@
  *
  * Signals that you can add callbacks for are:
  *
- * clicked - The user has double-clicked a item. The event_info
+ * clicked,double - The user has double-clicked a item. The event_info
  * parameter is the Gengrid item that was double-clicked.
  *
  * selected - The user has made an item selected. The event_info
@@ -810,7 +810,10 @@ _mouse_down(void        *data,
    item->wd->wasselected = item->selected;
    _item_hilight(item);
    if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
-     evas_object_smart_callback_call(item->wd->self, "clicked", item);
+     {
+        evas_object_smart_callback_call(item->wd->self, "clicked,double", item);
+        evas_object_smart_callback_call(item->wd->self, "clicked", item); // will be removed
+     }
    if (item->long_timer) ecore_timer_del(item->long_timer);
    if (item->realized)
      item->long_timer = ecore_timer_add(_elm_config->longpress_timeout,

diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index a2bd972..7418dd6 100644 (file)
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -17,7 +17,7 @@
  *
  * Signals that you can add callbacks for are:
  *
- * clicked - This is called when a user has double-clicked an item. The
+ * clicked,double - This is called when a user has double-clicked an item. The
  * event_info parameter is the genlist item that was double-clicked.
  *
  * selected - This is called when a user has made an item selected. The
@@ -1515,7 +1515,10 @@ _mouse_down(void        *data,
    _item_highlight(it);
    if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
      if ((!it->disabled) && (!it->display_only))
-       evas_object_smart_callback_call(it->base.widget, "clicked", it);
+       {
+          evas_object_smart_callback_call(it->base.widget, "clicked,double", it);
+          evas_object_smart_callback_call(it->base.widget, "clicked", it); // will be removed
+       }
    if (it->long_timer) ecore_timer_del(it->long_timer);
    if (it->swipe_timer) ecore_timer_del(it->swipe_timer);
    it->swipe_timer = ecore_timer_add(0.4, _swipe_cancel, it);

diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index b228715..6d2e6d4 100644 (file)
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -848,7 +848,10 @@ _mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void
    it->swipe_timer = ecore_timer_add(0.4, _swipe_cancel, it);
    /* Always call the callbacks last - the user may delete our context! */
    if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
-     evas_object_smart_callback_call(it->base.widget, "clicked", it);
+     {
+        evas_object_smart_callback_call(it->base.widget, "clicked,double", it);
+        evas_object_smart_callback_call(it->base.widget, "clicked", it); // will be removed
+     }
    wd->swipe = EINA_FALSE;
    wd->movements = 0;
 }