diff --git a/legacy/elementary/src/lib/Elementary.h.in b/legacy/elementary/src/lib/Elementary.h.in index 5fd10e3e9f..8aaf37c6fb 100644 --- a/legacy/elementary/src/lib/Elementary.h.in +++ b/legacy/elementary/src/lib/Elementary.h.in @@ -8093,13 +8093,13 @@ extern "C" { * started. * - @c "scroll,drag,stop" - called when dragging the content has * stopped. - * - @c "scroll,edge,top" - This is called when the gengrid is scrolled until + * - @c "edge,top" - This is called when the gengrid is scrolled until * the top edge. - * - @c "scroll,edge,bottom" - This is called when the gengrid is scrolled + * - @c "edge,bottom" - This is called when the gengrid is scrolled * until the bottom edge. - * - @c "scroll,edge,left" - This is called when the gengrid is scrolled + * - @c "edge,left" - This is called when the gengrid is scrolled * until the left edge. - * - @c "scroll,edge,right" - This is called when the gengrid is scrolled + * - @c "edge,right" - This is called when the gengrid is scrolled * until the right edge. * * List of gengrid examples: @@ -15944,10 +15944,10 @@ extern "C" { * - "selected" - when the user selected an item * - "unselected" - when the user unselected an item * - "longpressed" - an item in the list is long-pressed - * - "scroll,edge,top" - the list is scrolled until the top edge - * - "scroll,edge,bottom" - the list is scrolled until the bottom edge - * - "scroll,edge,left" - the list is scrolled until the left edge - * - "scroll,edge,right" - the list is scrolled until the right edge + * - "edge,top" - the list is scrolled until the top edge + * - "edge,bottom" - the list is scrolled until the bottom edge + * - "edge,left" - the list is scrolled until the left edge + * - "edge,right" - the list is scrolled until the right edge * - "language,changed" - the program's language changed * * Available styles for it: @@ -18062,13 +18062,13 @@ extern "C" { * started. * - @c "scroll,drag,stop" - This is called when dragging the content has * stopped. - * - @c "scroll,edge,top" - This is called when the genlist is scrolled until + * - @c "edge,top" - This is called when the genlist is scrolled until * the top edge. - * - @c "scroll,edge,bottom" - This is called when the genlist is scrolled + * - @c "edge,bottom" - This is called when the genlist is scrolled * until the bottom edge. - * - @c "scroll,edge,left" - This is called when the genlist is scrolled + * - @c "edge,left" - This is called when the genlist is scrolled * until the left edge. - * - @c "scroll,edge,right" - This is called when the genlist is scrolled + * - @c "edge,right" - This is called when the genlist is scrolled * until the right edge. * - @c "multi,swipe,left" - This is called when the genlist is multi-touch * swiped left. diff --git a/legacy/elementary/src/lib/elm_gengrid.c b/legacy/elementary/src/lib/elm_gengrid.c index edda2f1162..2539dc832a 100644 --- a/legacy/elementary/src/lib/elm_gengrid.c +++ b/legacy/elementary/src/lib/elm_gengrid.c @@ -153,10 +153,14 @@ static const char SIG_SCROLL_ANIM_START[] = "scroll,anim,start"; static const char SIG_SCROLL_ANIM_STOP[] = "scroll,anim,stop"; static const char SIG_SCROLL_DRAG_START[] = "scroll,drag,start"; static const char SIG_SCROLL_DRAG_STOP[] = "scroll,drag,stop"; -static const char SIG_SCROLL_EDGE_TOP[] = "scroll,edge,top"; -static const char SIG_SCROLL_EDGE_BOTTOM[] = "scroll,edge,bottom"; -static const char SIG_SCROLL_EDGE_LEFT[] = "scroll,edge,left"; -static const char SIG_SCROLL_EDGE_RIGHT[] = "scroll,edge,right"; +static const char SIG_SCROLL_EDGE_TOP[] = "scroll,edge,top"; // TODO : remove this +static const char SIG_SCROLL_EDGE_BOTTOM[] = "scroll,edge,bottom"; // TODO : remove this +static const char SIG_SCROLL_EDGE_LEFT[] = "scroll,edge,left"; // TODO : remove this +static const char SIG_SCROLL_EDGE_RIGHT[] = "scroll,edge,right"; // TODO : remove this +static const char SIG_EDGE_TOP[] = "edge,top"; +static const char SIG_EDGE_BOTTOM[] = "edge,bottom"; +static const char SIG_EDGE_LEFT[] = "edge,left"; +static const char SIG_EDGE_RIGHT[] = "edge,right"; static const char SIG_MOVED[] = "moved"; static const Evas_Smart_Cb_Description _signals[] = { @@ -183,6 +187,10 @@ static const Evas_Smart_Cb_Description _signals[] = { {SIG_SCROLL_EDGE_BOTTOM, ""}, {SIG_SCROLL_EDGE_LEFT, ""}, {SIG_SCROLL_EDGE_RIGHT, ""}, + {SIG_EDGE_TOP, ""}, + {SIG_EDGE_BOTTOM, ""}, + {SIG_EDGE_LEFT, ""}, + {SIG_EDGE_RIGHT, ""}, {SIG_MOVED, ""}, {NULL, NULL} }; @@ -1901,35 +1909,39 @@ _scr_drag_stop(void *data, } static void -_scr_edge_left(void *data, - Evas_Object *scr __UNUSED__, - void *event_info __UNUSED__) +_edge_left(void *data, + Evas_Object *scr __UNUSED__, + void *event_info __UNUSED__) { evas_object_smart_callback_call(data, SIG_SCROLL_EDGE_LEFT, NULL); + evas_object_smart_callback_call(data, SIG_EDGE_LEFT, NULL); } static void -_scr_edge_right(void *data, - Evas_Object *scr __UNUSED__, - void *event_info __UNUSED__) +_edge_right(void *data, + Evas_Object *scr __UNUSED__, + void *event_info __UNUSED__) { evas_object_smart_callback_call(data, SIG_SCROLL_EDGE_RIGHT, NULL); + evas_object_smart_callback_call(data, SIG_EDGE_RIGHT, NULL); } static void -_scr_edge_top(void *data, - Evas_Object *scr __UNUSED__, - void *event_info __UNUSED__) +_edge_top(void *data, + Evas_Object *scr __UNUSED__, + void *event_info __UNUSED__) { evas_object_smart_callback_call(data, SIG_SCROLL_EDGE_TOP, NULL); + evas_object_smart_callback_call(data, SIG_EDGE_TOP, NULL); } static void -_scr_edge_bottom(void *data, - Evas_Object *scr __UNUSED__, - void *event_info __UNUSED__) +_edge_bottom(void *data, + Evas_Object *scr __UNUSED__, + void *event_info __UNUSED__) { evas_object_smart_callback_call(data, SIG_SCROLL_EDGE_BOTTOM, NULL); + evas_object_smart_callback_call(data, SIG_EDGE_BOTTOM, NULL); } static void @@ -1993,10 +2005,10 @@ elm_gengrid_add(Evas_Object *parent) evas_object_smart_callback_add(wd->scr, "animate,stop", _scr_anim_stop, obj); evas_object_smart_callback_add(wd->scr, "drag,start", _scr_drag_start, obj); evas_object_smart_callback_add(wd->scr, "drag,stop", _scr_drag_stop, obj); - evas_object_smart_callback_add(wd->scr, "edge,left", _scr_edge_left, obj); - evas_object_smart_callback_add(wd->scr, "edge,right", _scr_edge_right, obj); - evas_object_smart_callback_add(wd->scr, "edge,top", _scr_edge_top, obj); - evas_object_smart_callback_add(wd->scr, "edge,bottom", _scr_edge_bottom, + evas_object_smart_callback_add(wd->scr, "edge,left", _edge_left, obj); + evas_object_smart_callback_add(wd->scr, "edge,right", _edge_right, obj); + evas_object_smart_callback_add(wd->scr, "edge,top", _edge_top, obj); + evas_object_smart_callback_add(wd->scr, "edge,bottom", _edge_bottom, obj); evas_object_smart_callback_add(wd->scr, "scroll", _scr_scroll, obj); diff --git a/legacy/elementary/src/lib/elm_genlist.c b/legacy/elementary/src/lib/elm_genlist.c index 2c8ae39207..5fb057b760 100644 --- a/legacy/elementary/src/lib/elm_genlist.c +++ b/legacy/elementary/src/lib/elm_genlist.c @@ -261,10 +261,14 @@ static const char SIG_SCROLL_ANIM_START[] = "scroll,anim,start"; static const char SIG_SCROLL_ANIM_STOP[] = "scroll,anim,stop"; static const char SIG_SCROLL_DRAG_START[] = "scroll,drag,start"; static const char SIG_SCROLL_DRAG_STOP[] = "scroll,drag,stop"; -static const char SIG_SCROLL_EDGE_TOP[] = "scroll,edge,top"; -static const char SIG_SCROLL_EDGE_BOTTOM[] = "scroll,edge,bottom"; -static const char SIG_SCROLL_EDGE_LEFT[] = "scroll,edge,left"; -static const char SIG_SCROLL_EDGE_RIGHT[] = "scroll,edge,right"; +static const char SIG_SCROLL_EDGE_TOP[] = "scroll,edge,top"; // TODO : remove this +static const char SIG_SCROLL_EDGE_BOTTOM[] = "scroll,edge,bottom"; // TODO : remove this +static const char SIG_SCROLL_EDGE_LEFT[] = "scroll,edge,left"; // TODO : remove this +static const char SIG_SCROLL_EDGE_RIGHT[] = "scroll,edge,right"; // TODO : remove this +static const char SIG_EDGE_TOP[] = "edge,top"; +static const char SIG_EDGE_BOTTOM[] = "edge,bottom"; +static const char SIG_EDGE_LEFT[] = "edge,left"; +static const char SIG_EDGE_RIGHT[] = "edge,right"; static const char SIG_MULTI_SWIPE_LEFT[] = "multi,swipe,left"; static const char SIG_MULTI_SWIPE_RIGHT[] = "multi,swipe,right"; static const char SIG_MULTI_SWIPE_UP[] = "multi,swipe,up"; @@ -299,6 +303,10 @@ static const Evas_Smart_Cb_Description _signals[] = { {SIG_SCROLL_EDGE_BOTTOM, ""}, {SIG_SCROLL_EDGE_LEFT, ""}, {SIG_SCROLL_EDGE_RIGHT, ""}, + {SIG_EDGE_TOP, ""}, + {SIG_EDGE_BOTTOM, ""}, + {SIG_EDGE_LEFT, ""}, + {SIG_EDGE_RIGHT, ""}, {SIG_MULTI_SWIPE_LEFT, ""}, {SIG_MULTI_SWIPE_RIGHT, ""}, {SIG_MULTI_SWIPE_UP, ""}, @@ -2871,39 +2879,43 @@ _scr_drag_stop(void *data, } static void -_scroll_edge_left(void *data, - Evas_Object *scr __UNUSED__, - void *event_info __UNUSED__) +_edge_left(void *data, + Evas_Object *scr __UNUSED__, + void *event_info __UNUSED__) { Evas_Object *obj = data; evas_object_smart_callback_call(obj, SIG_SCROLL_EDGE_LEFT, NULL); + evas_object_smart_callback_call(obj, SIG_EDGE_LEFT, NULL); } static void -_scroll_edge_right(void *data, - Evas_Object *scr __UNUSED__, - void *event_info __UNUSED__) +_edge_right(void *data, + Evas_Object *scr __UNUSED__, + void *event_info __UNUSED__) { Evas_Object *obj = data; evas_object_smart_callback_call(obj, SIG_SCROLL_EDGE_RIGHT, NULL); + evas_object_smart_callback_call(obj, SIG_EDGE_RIGHT, NULL); } static void -_scroll_edge_top(void *data, - Evas_Object *scr __UNUSED__, - void *event_info __UNUSED__) +_edge_top(void *data, + Evas_Object *scr __UNUSED__, + void *event_info __UNUSED__) { Evas_Object *obj = data; evas_object_smart_callback_call(obj, SIG_SCROLL_EDGE_TOP, NULL); + evas_object_smart_callback_call(obj, SIG_EDGE_TOP, NULL); } static void -_scroll_edge_bottom(void *data, - Evas_Object *scr __UNUSED__, - void *event_info __UNUSED__) +_edge_bottom(void *data, + Evas_Object *scr __UNUSED__, + void *event_info __UNUSED__) { Evas_Object *obj = data; evas_object_smart_callback_call(obj, SIG_SCROLL_EDGE_BOTTOM, NULL); + evas_object_smart_callback_call(obj, SIG_EDGE_BOTTOM, NULL); } static void @@ -3114,12 +3126,10 @@ elm_genlist_add(Evas_Object *parent) evas_object_smart_callback_add(wd->scr, "animate,stop", _scr_anim_stop, obj); evas_object_smart_callback_add(wd->scr, "drag,start", _scr_drag_start, obj); evas_object_smart_callback_add(wd->scr, "drag,stop", _scr_drag_stop, obj); - evas_object_smart_callback_add(wd->scr, "edge,left", _scroll_edge_left, obj); - evas_object_smart_callback_add(wd->scr, "edge,right", _scroll_edge_right, - obj); - evas_object_smart_callback_add(wd->scr, "edge,top", _scroll_edge_top, obj); - evas_object_smart_callback_add(wd->scr, "edge,bottom", _scroll_edge_bottom, - obj); + evas_object_smart_callback_add(wd->scr, "edge,left", _edge_left, obj); + evas_object_smart_callback_add(wd->scr, "edge,right", _edge_right, obj); + evas_object_smart_callback_add(wd->scr, "edge,top", _edge_top, obj); + evas_object_smart_callback_add(wd->scr, "edge,bottom", _edge_bottom, obj); wd->obj = obj; wd->mode = ELM_LIST_SCROLL; diff --git a/legacy/elementary/src/lib/elm_list.c b/legacy/elementary/src/lib/elm_list.c index 45cd4688fa..e6139fc034 100644 --- a/legacy/elementary/src/lib/elm_list.c +++ b/legacy/elementary/src/lib/elm_list.c @@ -66,10 +66,10 @@ static void _fix_items(Evas_Object *obj); static void _mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info); static void _mouse_up(void *data, Evas *evas, Evas_Object *obj, void *event_info); static void _mouse_move(void *data, Evas *evas, Evas_Object *obj, void *event_info); -static void _scroll_edge_left(void *data, Evas_Object *scr, void *event_info); -static void _scroll_edge_right(void *data, Evas_Object *scr, void *event_info); -static void _scroll_edge_top(void *data, Evas_Object *scr, void *event_info); -static void _scroll_edge_bottom(void *data, Evas_Object *scr, void *event_info); +static void _edge_left(void *data, Evas_Object *scr, void *event_info); +static void _edge_right(void *data, Evas_Object *scr, void *event_info); +static void _edge_top(void *data, Evas_Object *scr, void *event_info); +static void _edge_bottom(void *data, Evas_Object *scr, void *event_info); static Eina_Bool _item_multi_select_up(Widget_Data *wd); static Eina_Bool _item_multi_select_down(Widget_Data *wd); static Eina_Bool _item_single_select_up(Widget_Data *wd); @@ -83,10 +83,14 @@ static const char SIG_CLICKED_DOUBLE[] = "clicked,double"; static const char SIG_SELECTED[] = "selected"; static const char SIG_UNSELECTED[] = "unselected"; static const char SIG_LONGPRESSED[] = "longpressed"; -static const char SIG_SCROLL_EDGE_TOP[] = "scroll,edge,top"; -static const char SIG_SCROLL_EDGE_BOTTOM[] = "scroll,edge,bottom"; -static const char SIG_SCROLL_EDGE_LEFT[] = "scroll,edge,left"; -static const char SIG_SCROLL_EDGE_RIGHT[] = "scroll,edge,right"; +static const char SIG_SCROLL_EDGE_TOP[] = "scroll,edge,top"; // TODO : remove this +static const char SIG_SCROLL_EDGE_BOTTOM[] = "scroll,edge,bottom"; // TODO : remove this +static const char SIG_SCROLL_EDGE_LEFT[] = "scroll,edge,left"; // TODO : remove this +static const char SIG_SCROLL_EDGE_RIGHT[] = "scroll,edge,right"; // TODO : remove this +static const char SIG_EDGE_TOP[] = "edge,top"; +static const char SIG_EDGE_BOTTOM[] = "edge,bottom"; +static const char SIG_EDGE_LEFT[] = "edge,left"; +static const char SIG_EDGE_RIGHT[] = "edge,right"; static const Evas_Smart_Cb_Description _signals[] = { {SIG_ACTIVATED, ""}, @@ -98,6 +102,10 @@ static const Evas_Smart_Cb_Description _signals[] = { {SIG_SCROLL_EDGE_BOTTOM, ""}, {SIG_SCROLL_EDGE_LEFT, ""}, {SIG_SCROLL_EDGE_RIGHT, ""}, + {SIG_EDGE_TOP, ""}, + {SIG_EDGE_BOTTOM, ""}, + {SIG_EDGE_LEFT, ""}, + {SIG_EDGE_RIGHT, ""}, {NULL, NULL} }; @@ -837,31 +845,35 @@ _mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void } static void -_scroll_edge_left(void *data, Evas_Object *scr __UNUSED__, void *event_info __UNUSED__) +_edge_left(void *data, Evas_Object *scr __UNUSED__, void *event_info __UNUSED__) { Evas_Object *obj = data; evas_object_smart_callback_call(obj, SIG_SCROLL_EDGE_LEFT, NULL); + evas_object_smart_callback_call(obj, SIG_EDGE_LEFT, NULL); } static void -_scroll_edge_right(void *data, Evas_Object *scr __UNUSED__, void *event_info __UNUSED__) +_edge_right(void *data, Evas_Object *scr __UNUSED__, void *event_info __UNUSED__) { Evas_Object *obj = data; evas_object_smart_callback_call(obj, SIG_SCROLL_EDGE_RIGHT, NULL); + evas_object_smart_callback_call(obj, SIG_EDGE_RIGHT, NULL); } static void -_scroll_edge_top(void *data, Evas_Object *scr __UNUSED__, void *event_info __UNUSED__) +_edge_top(void *data, Evas_Object *scr __UNUSED__, void *event_info __UNUSED__) { Evas_Object *obj = data; evas_object_smart_callback_call(obj, SIG_SCROLL_EDGE_TOP, NULL); + evas_object_smart_callback_call(obj, SIG_EDGE_TOP, NULL); } static void -_scroll_edge_bottom(void *data, Evas_Object *scr __UNUSED__, void *event_info __UNUSED__) +_edge_bottom(void *data, Evas_Object *scr __UNUSED__, void *event_info __UNUSED__) { Evas_Object *obj = data; evas_object_smart_callback_call(obj, SIG_SCROLL_EDGE_BOTTOM, NULL); + evas_object_smart_callback_call(obj, SIG_EDGE_BOTTOM, NULL); } static Eina_Bool @@ -1357,10 +1369,10 @@ elm_list_add(Evas_Object *parent) wd->mode = ELM_LIST_SCROLL; - evas_object_smart_callback_add(wd->scr, "edge,left", _scroll_edge_left, obj); - evas_object_smart_callback_add(wd->scr, "edge,right", _scroll_edge_right, obj); - evas_object_smart_callback_add(wd->scr, "edge,top", _scroll_edge_top, obj); - evas_object_smart_callback_add(wd->scr, "edge,bottom", _scroll_edge_bottom, obj); + evas_object_smart_callback_add(wd->scr, "edge,left", _edge_left, obj); + evas_object_smart_callback_add(wd->scr, "edge,right", _edge_right, obj); + evas_object_smart_callback_add(wd->scr, "edge,top", _edge_top, obj); + evas_object_smart_callback_add(wd->scr, "edge,bottom", _edge_bottom, obj); evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj); evas_object_smart_callback_add(obj, "scroll-hold-on", _hold_on, obj);