Elementary: Fixed wrong smart callback signal name. clicked -> clicked,double
Unified double-click smart callback signal name to "clicked,double". Wrong signal name "clicked" is still there. But this will be removed soon after fixing all codes in trunk. SVN revision: 58293
This commit is contained in:
parent
b690e88b69
commit
16848f903d
|
@ -12,7 +12,7 @@
|
||||||
*
|
*
|
||||||
* Signals that you can add callbacks for are:
|
* Signals that you can add callbacks for are:
|
||||||
*
|
*
|
||||||
* clicked - The user has double-clicked or pressed enter on
|
* clicked,double - The user has double-clicked or pressed enter on
|
||||||
* a item. The event_infoparameter is the Gengrid item
|
* a item. The event_infoparameter is the Gengrid item
|
||||||
* that was double-clicked.
|
* that was double-clicked.
|
||||||
*
|
*
|
||||||
|
@ -436,7 +436,8 @@ _event_hook(Evas_Object *obj,
|
||||||
(!strcmp(ev->keyname, "space")))
|
(!strcmp(ev->keyname, "space")))
|
||||||
{
|
{
|
||||||
item = elm_gengrid_selected_item_get(obj);
|
item = elm_gengrid_selected_item_get(obj);
|
||||||
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
|
||||||
}
|
}
|
||||||
else return EINA_FALSE;
|
else return EINA_FALSE;
|
||||||
|
|
||||||
|
@ -851,7 +852,10 @@ _mouse_down(void *data,
|
||||||
item->wd->wasselected = item->selected;
|
item->wd->wasselected = item->selected;
|
||||||
_item_hilight(item);
|
_item_hilight(item);
|
||||||
if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
|
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->long_timer) ecore_timer_del(item->long_timer);
|
||||||
if (item->realized)
|
if (item->realized)
|
||||||
item->long_timer = ecore_timer_add(_elm_config->longpress_timeout,
|
item->long_timer = ecore_timer_add(_elm_config->longpress_timeout,
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
*
|
*
|
||||||
* Signals that you can add callbacks for are:
|
* 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.
|
* event_info parameter is the genlist item that was double-clicked.
|
||||||
*
|
*
|
||||||
* selected - This is called when a user has made an item selected. The
|
* selected - This is called when a user has made an item selected. The
|
||||||
|
@ -1342,7 +1342,10 @@ _mouse_down(void *data,
|
||||||
_item_highlight(it);
|
_item_highlight(it);
|
||||||
if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
|
if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
|
||||||
if ((!it->disabled) && (!it->display_only))
|
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->long_timer) ecore_timer_del(it->long_timer);
|
||||||
if (it->swipe_timer) ecore_timer_del(it->swipe_timer);
|
if (it->swipe_timer) ecore_timer_del(it->swipe_timer);
|
||||||
it->swipe_timer = ecore_timer_add(0.4, _swipe_cancel, it);
|
it->swipe_timer = ecore_timer_add(0.4, _swipe_cancel, it);
|
||||||
|
|
|
@ -888,7 +888,10 @@ _mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void
|
||||||
it->swipe_timer = ecore_timer_add(0.4, _swipe_cancel, it);
|
it->swipe_timer = ecore_timer_add(0.4, _swipe_cancel, it);
|
||||||
/* Always call the callbacks last - the user may delete our context! */
|
/* Always call the callbacks last - the user may delete our context! */
|
||||||
if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
|
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->swipe = EINA_FALSE;
|
||||||
wd->movements = 0;
|
wd->movements = 0;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue