From ef590b483b29ba5eb6c58683b6d37717a3bfde6a Mon Sep 17 00:00:00 2001 From: seoz Date: Tue, 12 Apr 2011 17:29:59 +0000 Subject: [PATCH] Elementary: Applied "clicked" signal name change for gengrid/list/genlist. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@58596 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/bin/test_gengrid.c | 6 +++--- src/bin/test_genlist.c | 10 +++++----- src/bin/test_store.c | 6 +++--- src/lib/Elementary.h.in | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/bin/test_gengrid.c b/src/bin/test_gengrid.c index a3cc18f..4cea725 100644 --- a/src/bin/test_gengrid.c +++ b/src/bin/test_gengrid.c @@ -70,9 +70,9 @@ grid_selected(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in } static void -grid_clicked(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +grid_double_clicked(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { - printf("Clicked: %p\n", event_info); + printf("Double clicked: %p\n", event_info); } static void @@ -163,7 +163,7 @@ test_gengrid(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf elm_gengrid_horizontal_set(grid, EINA_FALSE); elm_gengrid_multi_select_set(grid, EINA_TRUE); evas_object_smart_callback_add(grid, "selected", grid_selected, NULL); - evas_object_smart_callback_add(grid, "clicked", grid_clicked, NULL); + evas_object_smart_callback_add(grid, "clicked,double", grid_double_clicked, NULL); evas_object_smart_callback_add(grid, "longpressed", grid_longpress, NULL); evas_object_smart_callback_add(grid, "drag,start,up", grid_drag_up, NULL); evas_object_smart_callback_add(grid, "drag,start,right", grid_drag_right, NULL); diff --git a/src/bin/test_genlist.c b/src/bin/test_genlist.c index 2e7564a..d14ccfb 100644 --- a/src/bin/test_genlist.c +++ b/src/bin/test_genlist.c @@ -87,9 +87,9 @@ _gl_selected(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf } static void -_gl_clicked(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_gl_double_clicked(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { - printf("clicked: %p\n", event_info); + printf("double clicked: %p\n", event_info); } static void @@ -122,7 +122,7 @@ test_genlist(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf gl = elm_genlist_add(win); evas_object_smart_callback_add(gl, "selected", _gl_selected, NULL); - evas_object_smart_callback_add(gl, "clicked", _gl_clicked, NULL); + evas_object_smart_callback_add(gl, "clicked,double", _gl_double_clicked, NULL); evas_object_smart_callback_add(gl, "longpressed", _gl_longpress, NULL); // FIXME: This causes genlist to resize the horiz axis very slowly :( // Reenable this and resize the window horizontally, then try to resize it back @@ -1365,7 +1365,7 @@ test_genlist8(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in gl = elm_genlist_add(win); evas_object_smart_callback_add(gl, "selected", _gl_selected, NULL); - evas_object_smart_callback_add(gl, "clicked", _gl_clicked, NULL); + evas_object_smart_callback_add(gl, "clicked,double", _gl_double_clicked, NULL); evas_object_smart_callback_add(gl, "longpressed", _gl_longpress, NULL); evas_object_size_hint_weight_set(gl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(gl, EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -1576,7 +1576,7 @@ test_genlist9(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in gl = elm_genlist_add(win); evas_object_smart_callback_add(gl, "selected", _gl_selected, NULL); - evas_object_smart_callback_add(gl, "clicked", _gl_clicked, NULL); + evas_object_smart_callback_add(gl, "clicked,double", _gl_double_clicked, NULL); evas_object_smart_callback_add(gl, "longpressed", _gl_longpress, NULL); evas_object_size_hint_weight_set(gl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(gl, EVAS_HINT_FILL, EVAS_HINT_FILL); diff --git a/src/bin/test_store.c b/src/bin/test_store.c index 8e7caeb..95e14ff 100644 --- a/src/bin/test_store.c +++ b/src/bin/test_store.c @@ -20,9 +20,9 @@ _st_selected(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf } static void -_st_clicked(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_st_double_clicked(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { - printf("clicked: %p\n", event_info); + printf("double clicked: %p\n", event_info); } static void @@ -246,7 +246,7 @@ test_store(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info gl = elm_genlist_add(win); elm_genlist_height_for_width_mode_set(gl, EINA_TRUE); evas_object_smart_callback_add(gl, "selected", _st_selected, NULL); - evas_object_smart_callback_add(gl, "clicked", _st_clicked, NULL); + evas_object_smart_callback_add(gl, "clicked,double", _st_double_clicked, NULL); evas_object_smart_callback_add(gl, "longpressed", _st_longpress, NULL); evas_object_size_hint_weight_set(gl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(gl, EVAS_HINT_FILL, EVAS_HINT_FILL); diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in index d719fff..e77d4b0 100644 --- a/src/lib/Elementary.h.in +++ b/src/lib/Elementary.h.in @@ -977,7 +977,7 @@ extern "C" { * * selected - User has selected a item. * unselected - User has unselected a item. - * clicked - User has double-clicked or pressed enter on a item. + * clicked,double - User has double-clicked or pressed enter on 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, @@ -1659,7 +1659,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 -- 2.7.4