diff --git a/src/bin/elementary/test_ui_scroller.c b/src/bin/elementary/test_ui_scroller.c index a042039109..02cae9a6da 100644 --- a/src/bin/elementary/test_ui_scroller.c +++ b/src/bin/elementary/test_ui_scroller.c @@ -12,17 +12,17 @@ _bt_clicked(void *data EINA_UNUSED, const Efl_Event *ev) } static void -_scroll_start_cb(void *data EINA_UNUSED, const Efl_Event *ev) +_scroll_started_cb(void *data EINA_UNUSED, const Efl_Event *ev) { Eina_Position2D pos = efl_ui_scrollable_content_pos_get(ev->object); printf("scroll start: %p x: %d y: %d\n", ev->object, pos.x, pos.y); } static void -_scroll_stop_cb(void *data EINA_UNUSED, const Efl_Event *ev) +_scroll_finished_cb(void *data EINA_UNUSED, const Efl_Event *ev) { Eina_Position2D pos = efl_ui_scrollable_content_pos_get(ev->object); - printf("scroll stop: %p x: %d y: %d\n", ev->object, pos.x, pos.y); + printf("scroll finish: %p x: %d y: %d\n", ev->object, pos.x, pos.y); } void @@ -39,8 +39,8 @@ test_efl_ui_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void sc = efl_add(EFL_UI_SCROLLER_CLASS, win, efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), - efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_START, _scroll_start_cb, NULL), - efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_STOP, _scroll_stop_cb, NULL), + efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_STARTED, _scroll_started_cb, NULL), + efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_FINISHED, _scroll_finished_cb, NULL), efl_content_set(win, efl_added)); bx = efl_add(EFL_UI_BOX_CLASS, sc, @@ -144,8 +144,8 @@ test_efl_ui_scroller_simple(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED sc = efl_add(EFL_UI_SCROLLER_CLASS, win, efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), - efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_START, _scroll_start_cb, NULL), - efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_STOP, _scroll_stop_cb, NULL), + efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_STARTED, _scroll_started_cb, NULL), + efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_FINISHED, _scroll_finished_cb, NULL), efl_content_set(win, efl_added)); bx = efl_add(EFL_UI_BOX_CLASS, sc, @@ -180,8 +180,8 @@ test_efl_ui_scroller_simple2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE sc = efl_add(EFL_UI_SCROLLER_CLASS, win, efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), - efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_START, _scroll_start_cb, NULL), - efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_STOP, _scroll_stop_cb, NULL), + efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_STARTED, _scroll_started_cb, NULL), + efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_FINISHED, _scroll_finished_cb, NULL), efl_content_set(win, efl_added)); tb = efl_add(EFL_UI_TABLE_CLASS, sc, diff --git a/src/lib/efl/interfaces/efl_ui_scrollable.eo b/src/lib/efl/interfaces/efl_ui_scrollable.eo index 42b76a7913..1bffa592af 100644 --- a/src/lib/efl/interfaces/efl_ui_scrollable.eo +++ b/src/lib/efl/interfaces/efl_ui_scrollable.eo @@ -3,9 +3,9 @@ interface @beta Efl.Ui.Scrollable [[Efl UI scrollable interface]] event_prefix: efl_ui; events { - scroll,start: void; [[Called when scroll operation starts]] - scroll: void; [[Called when scrolling]] - scroll,stop: void; [[Called when scroll operation stops]] + scroll,started: void; [[Called when scroll operation starts]] + scroll,changed: void; [[Called when scrolling]] + scroll,finished: void; [[Called when scroll operation finishes]] scroll,up: void; [[Called when scrolling upwards]] scroll,down: void; [[Called when scrolling downwards]] scroll,left: void; [[Called when scrolling left]] @@ -14,9 +14,9 @@ interface @beta Efl.Ui.Scrollable edge,down: void; [[Called when hitting the bottom edge]] edge,left: void; [[Called when hitting the left edge]] edge,right: void; [[Called when hitting the right edge]] - scroll,anim,start: void; [[Called when scroll animation starts]] - scroll,anim,stop: void; [[Called when scroll animation stopps]] - scroll,drag,start: void; [[Called when scroll drag starts]] - scroll,drag,stop: void; [[Called when scroll drag stops]] + scroll,anim,started: void; [[Called when scroll animation starts]] + scroll,anim,finished: void; [[Called when scroll animation finishes]] + scroll,drag,started: void; [[Called when scroll drag starts]] + scroll,drag,finished: void; [[Called when scroll drag finishes]] } } diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c index 014b0dec51..e748d61da6 100644 --- a/src/lib/elementary/efl_ui_image_zoomable.c +++ b/src/lib/elementary/efl_ui_image_zoomable.c @@ -1428,7 +1428,7 @@ _efl_ui_image_zoomable_edje_drag_start_cb(void *data, sd->freeze_want = efl_ui_scrollable_scroll_freeze_get(sd->smanager); efl_ui_scrollable_scroll_freeze_set(sd->smanager, EINA_TRUE); - efl_event_callback_call(data, EFL_UI_EVENT_SCROLL_DRAG_START, NULL); + efl_event_callback_call(data, EFL_UI_EVENT_SCROLL_DRAG_STARTED, NULL); } static void @@ -1442,7 +1442,7 @@ _efl_ui_image_zoomable_edje_drag_stop_cb(void *data, _efl_ui_image_zoomable_bar_read_and_update(data); efl_ui_scrollable_scroll_freeze_set(sd->smanager, sd->freeze_want); - efl_event_callback_call(data, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL); + efl_event_callback_call(data, EFL_UI_EVENT_SCROLL_DRAG_FINISHED, NULL); } static void @@ -1837,7 +1837,7 @@ _efl_ui_image_zoomable_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Image_Zoomable else edje_object_part_swallow(edje, "efl.content", priv->pan_obj); - efl_event_callback_add(obj, EFL_UI_EVENT_SCROLL, _scroll_cb, obj); + efl_event_callback_add(obj, EFL_UI_EVENT_SCROLL_CHANGED, _scroll_cb, obj); priv->g_layer_start = 1.0; priv->zoom = 1; @@ -1902,7 +1902,7 @@ _efl_ui_image_zoomable_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Image_Zoomable ecore_timer_del(sd->scr_timer); efl_event_callback_del(obj, EFL_CANVAS_OBJECT_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj); efl_event_callback_del(obj, EFL_CANVAS_OBJECT_EVENT_ANIMATOR_TICK, _bounce_eval, obj); - efl_event_callback_del(obj, EFL_UI_EVENT_SCROLL, _scroll_cb, obj); + efl_event_callback_del(obj, EFL_UI_EVENT_SCROLL_CHANGED, _scroll_cb, obj); _efl_ui_image_zoomable_edje_object_detach(obj); efl_del(sd->pan_obj); diff --git a/src/lib/elementary/efl_ui_list_view.c b/src/lib/elementary/efl_ui_list_view.c index 0f95bfb880..224f51a2fc 100644 --- a/src/lib/elementary/efl_ui_list_view.c +++ b/src/lib/elementary/efl_ui_list_view.c @@ -324,7 +324,7 @@ _efl_ui_list_view_edje_drag_start_cb(void *data, pd->scrl_freeze = efl_ui_scrollable_scroll_freeze_get(pd->scrl_mgr); efl_ui_scrollable_scroll_freeze_set(pd->scrl_mgr, EINA_TRUE); - efl_event_callback_call(data, EFL_UI_EVENT_SCROLL_DRAG_START, NULL); + efl_event_callback_call(data, EFL_UI_EVENT_SCROLL_DRAG_STARTED, NULL); } static void @@ -338,7 +338,7 @@ _efl_ui_list_view_edje_drag_stop_cb(void *data, _efl_ui_list_view_bar_read_and_update(data); efl_ui_scrollable_scroll_freeze_set(pd->scrl_mgr, pd->scrl_freeze); - efl_event_callback_call(data, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL); + efl_event_callback_call(data, EFL_UI_EVENT_SCROLL_DRAG_FINISHED, NULL); } static void diff --git a/src/lib/elementary/efl_ui_panel.c b/src/lib/elementary/efl_ui_panel.c index fc2ee66c8a..ea6f8bd9aa 100644 --- a/src/lib/elementary/efl_ui_panel.c +++ b/src/lib/elementary/efl_ui_panel.c @@ -1227,8 +1227,8 @@ _efl_ui_panel_scrollable_set(Eo *obj, Efl_Ui_Panel_Data *sd, Eina_Bool scrollabl sd->smanager = efl_add(EFL_UI_SCROLL_MANAGER_CLASS, obj); efl_ui_mirrored_set(sd->smanager, efl_ui_mirrored_get(obj)); - efl_event_callback_add(obj, EFL_UI_EVENT_SCROLL_ANIM_STOP, _anim_stop_cb, NULL); - efl_event_callback_add(obj, EFL_UI_EVENT_SCROLL, _scroll_cb, NULL); + efl_event_callback_add(obj, EFL_UI_EVENT_SCROLL_ANIM_FINISHED, _anim_stop_cb, NULL); + efl_event_callback_add(obj, EFL_UI_EVENT_SCROLL_CHANGED, _scroll_cb, NULL); } efl_composite_attach(obj, sd->smanager); diff --git a/src/lib/elementary/efl_ui_scroll_manager.c b/src/lib/elementary/efl_ui_scroll_manager.c index 7bf0a1dd1a..db5fe303a2 100644 --- a/src/lib/elementary/efl_ui_scroll_manager.c +++ b/src/lib/elementary/efl_ui_scroll_manager.c @@ -158,20 +158,20 @@ static void _efl_ui_scroll_manager_scroll_start(Efl_Ui_Scroll_Manager_Data *sd) { sd->scrolling = EINA_TRUE; - efl_event_callback_call(sd->parent, EFL_UI_EVENT_SCROLL_START, NULL); + efl_event_callback_call(sd->parent, EFL_UI_EVENT_SCROLL_STARTED, NULL); } static void _efl_ui_scroll_manager_scroll_stop(Efl_Ui_Scroll_Manager_Data *sd) { sd->scrolling = EINA_FALSE; - efl_event_callback_call(sd->parent, EFL_UI_EVENT_SCROLL_STOP, NULL); + efl_event_callback_call(sd->parent, EFL_UI_EVENT_SCROLL_FINISHED, NULL); } static void _efl_ui_scroll_manager_drag_start(Efl_Ui_Scroll_Manager_Data *sd) { - efl_event_callback_call(sd->parent, EFL_UI_EVENT_SCROLL_DRAG_START, NULL); + efl_event_callback_call(sd->parent, EFL_UI_EVENT_SCROLL_DRAG_STARTED, NULL); if (!sd->scrolling) _efl_ui_scroll_manager_scroll_start(sd); } @@ -179,13 +179,13 @@ _efl_ui_scroll_manager_drag_start(Efl_Ui_Scroll_Manager_Data *sd) static void _efl_ui_scroll_manager_drag_stop(Efl_Ui_Scroll_Manager_Data *sd) { - efl_event_callback_call(sd->parent, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL); + efl_event_callback_call(sd->parent, EFL_UI_EVENT_SCROLL_DRAG_FINISHED, NULL); } static void _efl_ui_scroll_manager_anim_start(Efl_Ui_Scroll_Manager_Data *sd) { - efl_event_callback_call(sd->parent, EFL_UI_EVENT_SCROLL_ANIM_START, NULL); + efl_event_callback_call(sd->parent, EFL_UI_EVENT_SCROLL_ANIM_STARTED, NULL); if (!sd->scrolling) _efl_ui_scroll_manager_scroll_start(sd); } @@ -193,7 +193,7 @@ _efl_ui_scroll_manager_anim_start(Efl_Ui_Scroll_Manager_Data *sd) static void _efl_ui_scroll_manager_anim_stop(Efl_Ui_Scroll_Manager_Data *sd) { - efl_event_callback_call(sd->parent, EFL_UI_EVENT_SCROLL_ANIM_STOP, NULL); + efl_event_callback_call(sd->parent, EFL_UI_EVENT_SCROLL_ANIM_FINISHED, NULL); if (sd->scrolling) _efl_ui_scroll_manager_scroll_stop(sd); } @@ -201,7 +201,7 @@ _efl_ui_scroll_manager_anim_stop(Efl_Ui_Scroll_Manager_Data *sd) static void _efl_ui_scroll_manager_scroll(Efl_Ui_Scroll_Manager_Data *sd) { - efl_event_callback_call(sd->parent, EFL_UI_EVENT_SCROLL, NULL); + efl_event_callback_call(sd->parent, EFL_UI_EVENT_SCROLL_CHANGED, NULL); } static void diff --git a/src/lib/elementary/efl_ui_scroll_util.c b/src/lib/elementary/efl_ui_scroll_util.c index 9eacd20ff2..abf77110d6 100644 --- a/src/lib/elementary/efl_ui_scroll_util.c +++ b/src/lib/elementary/efl_ui_scroll_util.c @@ -81,7 +81,7 @@ _scroll_connector_edje_drag_start_cb(void *data, ctx->freeze_want = efl_ui_scrollable_scroll_freeze_get(ctx->smanager); efl_ui_scrollable_scroll_freeze_set(ctx->smanager, EINA_TRUE); - efl_event_callback_call(ctx->obj, EFL_UI_EVENT_SCROLL_DRAG_START, NULL); + efl_event_callback_call(ctx->obj, EFL_UI_EVENT_SCROLL_DRAG_STARTED, NULL); } static void @@ -96,7 +96,7 @@ _scroll_connector_edje_drag_stop_cb(void *data, EINA_SAFETY_ON_TRUE_RETURN(ctx->freeze_want == -1); efl_ui_scrollable_scroll_freeze_set(ctx->smanager, ctx->freeze_want); ctx->freeze_want = -1; - efl_event_callback_call(ctx->obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL); + efl_event_callback_call(ctx->obj, EFL_UI_EVENT_SCROLL_DRAG_FINISHED, NULL); } static void diff --git a/src/lib/elementary/elm_diskselector.c b/src/lib/elementary/elm_diskselector.c index 3679ad65f8..d8d4e3a588 100644 --- a/src/lib/elementary/elm_diskselector.c +++ b/src/lib/elementary/elm_diskselector.c @@ -1049,7 +1049,7 @@ _scroll_animate_stop_cb(Evas_Object *obj, if (!it) return; _item_select(it); efl_event_callback_legacy_call - (data, EFL_UI_EVENT_SCROLL_ANIM_STOP, EO_OBJ(it)); + (data, EFL_UI_EVENT_SCROLL_ANIM_FINISHED, EO_OBJ(it)); } static void @@ -1057,7 +1057,7 @@ _scroll_animate_start_cb(Evas_Object *obj, void *data EINA_UNUSED) { efl_event_callback_legacy_call - (obj, EFL_UI_EVENT_SCROLL_ANIM_START, elm_diskselector_selected_item_get(obj)); + (obj, EFL_UI_EVENT_SCROLL_ANIM_STARTED, elm_diskselector_selected_item_get(obj)); } static void @@ -1065,7 +1065,7 @@ _scroll_drag_start_cb(Evas_Object *obj, void *data EINA_UNUSED) { efl_event_callback_legacy_call - (obj, EFL_UI_EVENT_SCROLL_DRAG_START, elm_diskselector_selected_item_get(obj)); + (obj, EFL_UI_EVENT_SCROLL_DRAG_STARTED, elm_diskselector_selected_item_get(obj)); } static void @@ -1073,7 +1073,7 @@ _scroll_drag_stop_cb(Evas_Object *obj, void *data EINA_UNUSED) { efl_event_callback_legacy_call - (obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, elm_diskselector_selected_item_get(obj)); + (obj, EFL_UI_EVENT_SCROLL_DRAG_FINISHED, elm_diskselector_selected_item_get(obj)); } static void diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c index 317c58f0b2..c186bdebc3 100644 --- a/src/lib/elementary/elm_entry.c +++ b/src/lib/elementary/elm_entry.c @@ -5150,7 +5150,7 @@ _scroll_cb(Evas_Object *obj, void *data EINA_UNUSED) ELM_ENTRY_DATA_GET(obj, sd); /* here we need to emit the signal that the elm_scroller would have done */ efl_event_callback_legacy_call - (obj, EFL_UI_EVENT_SCROLL, NULL); + (obj, EFL_UI_EVENT_SCROLL_CHANGED, NULL); if (sd->have_selection) _update_selection_handler(obj); diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c index 2cc089abf0..39e6c2a0b3 100644 --- a/src/lib/elementary/elm_gengrid.c +++ b/src/lib/elementary/elm_gengrid.c @@ -3714,28 +3714,28 @@ static void _scroll_animate_start_cb(Evas_Object *obj, void *data EINA_UNUSED) { - efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_ANIM_START, NULL); + efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_ANIM_STARTED, NULL); } static void _scroll_animate_stop_cb(Evas_Object *obj, void *data EINA_UNUSED) { - efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_ANIM_STOP, NULL); + efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_ANIM_FINISHED, NULL); } static void _scroll_drag_start_cb(Evas_Object *obj, void *data EINA_UNUSED) { - efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_DRAG_START, NULL); + efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_DRAG_STARTED, NULL); } static void _scroll_drag_stop_cb(Evas_Object *obj, void *data EINA_UNUSED) { - efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL); + efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_DRAG_FINISHED, NULL); } static void @@ -3777,7 +3777,7 @@ static void _scroll_cb(Evas_Object *obj, void *data EINA_UNUSED) { - efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL, NULL); + efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_CHANGED, NULL); } static int diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c index 37ebc34575..09dd0df73d 100644 --- a/src/lib/elementary/elm_genlist.c +++ b/src/lib/elementary/elm_genlist.c @@ -5541,35 +5541,35 @@ static void _scroll_animate_start_cb(Evas_Object *obj, void *data EINA_UNUSED) { - efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_ANIM_START, NULL); + efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_ANIM_STARTED, NULL); } static void _scroll_animate_stop_cb(Evas_Object *obj, void *data EINA_UNUSED) { - efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_ANIM_STOP, NULL); + efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_ANIM_FINISHED, NULL); } static void _scroll_drag_start_cb(Evas_Object *obj, void *data EINA_UNUSED) { - efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_DRAG_START, NULL); + efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_DRAG_STARTED, NULL); } static void _scroll_cb(Evas_Object *obj, void *data EINA_UNUSED) { - efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL, NULL); + efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_CHANGED, NULL); } static void _scroll_drag_stop_cb(Evas_Object *obj, void *data EINA_UNUSED) { - efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL); + efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_DRAG_FINISHED, NULL); } static void diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c index 49ac3a2f28..6590616b1d 100644 --- a/src/lib/elementary/elm_map.c +++ b/src/lib/elementary/elm_map.c @@ -1308,7 +1308,7 @@ _scr_timeout_cb(void *data) _smooth_update(sd); sd->scr_timer = NULL; efl_event_callback_legacy_call - (sd->obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL); + (sd->obj, EFL_UI_EVENT_SCROLL_DRAG_FINISHED, NULL); return ECORE_CALLBACK_CANCEL; } @@ -1322,11 +1322,11 @@ _scroll_cb(Evas_Object *obj, if (sd->scr_timer) ecore_timer_del(sd->scr_timer); else efl_event_callback_legacy_call - (sd->obj, EFL_UI_EVENT_SCROLL_DRAG_START, NULL); + (sd->obj, EFL_UI_EVENT_SCROLL_DRAG_STARTED, NULL); ELM_SAFE_FREE(sd->long_timer, ecore_timer_del); sd->scr_timer = ecore_timer_add(0.25, _scr_timeout_cb, obj); efl_event_callback_legacy_call - (sd->obj, EFL_UI_EVENT_SCROLL, NULL); + (sd->obj, EFL_UI_EVENT_SCROLL_CHANGED, NULL); } static void @@ -1336,7 +1336,7 @@ _scroll_animate_start_cb(Evas_Object *obj, ELM_MAP_DATA_GET(obj, sd); efl_event_callback_legacy_call - (sd->obj, EFL_UI_EVENT_SCROLL_ANIM_START, NULL); + (sd->obj, EFL_UI_EVENT_SCROLL_ANIM_STARTED, NULL); } static void @@ -1346,7 +1346,7 @@ _scroll_animate_stop_cb(Evas_Object *obj, ELM_MAP_DATA_GET(obj, sd); efl_event_callback_legacy_call - (sd->obj, EFL_UI_EVENT_SCROLL_ANIM_STOP, NULL); + (sd->obj, EFL_UI_EVENT_SCROLL_ANIM_FINISHED, NULL); } static Eina_Bool diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c index 2c89af648e..64074a6292 100644 --- a/src/lib/elementary/elm_panel.c +++ b/src/lib/elementary/elm_panel.c @@ -1233,7 +1233,7 @@ _scroll_cb(Evas_Object *obj, void *data EINA_UNUSED) break; } efl_event_callback_legacy_call - (obj, EFL_UI_EVENT_SCROLL, (void *) &event); + (obj, EFL_UI_EVENT_SCROLL_CHANGED, (void *) &event); } EOLIAN static void diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c index 8b8e08c477..6c84fa537c 100644 --- a/src/lib/elementary/elm_scroller.c +++ b/src/lib/elementary/elm_scroller.c @@ -488,7 +488,7 @@ _scroll_cb(Evas_Object *obj, void *data EINA_UNUSED) { efl_event_callback_legacy_call - (obj, EFL_UI_EVENT_SCROLL, NULL); + (obj, EFL_UI_EVENT_SCROLL_CHANGED, NULL); } static void @@ -524,7 +524,7 @@ _scroll_anim_start_cb(Evas_Object *obj, void *data EINA_UNUSED) { efl_event_callback_legacy_call - (obj, EFL_UI_EVENT_SCROLL_ANIM_START, NULL); + (obj, EFL_UI_EVENT_SCROLL_ANIM_STARTED, NULL); } static void @@ -532,7 +532,7 @@ _scroll_anim_stop_cb(Evas_Object *obj, void *data EINA_UNUSED) { efl_event_callback_legacy_call - (obj, EFL_UI_EVENT_SCROLL_ANIM_STOP, NULL); + (obj, EFL_UI_EVENT_SCROLL_ANIM_FINISHED, NULL); } static void @@ -540,7 +540,7 @@ _scroll_drag_start_cb(Evas_Object *obj, void *data EINA_UNUSED) { efl_event_callback_legacy_call - (obj, EFL_UI_EVENT_SCROLL_DRAG_START, NULL); + (obj, EFL_UI_EVENT_SCROLL_DRAG_STARTED, NULL); } static void @@ -548,7 +548,7 @@ _scroll_drag_stop_cb(Evas_Object *obj, void *data EINA_UNUSED) { efl_event_callback_legacy_call - (obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL); + (obj, EFL_UI_EVENT_SCROLL_DRAG_FINISHED, NULL); } static void diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c index 5e797e2620..a54c77a2fd 100644 --- a/src/lib/elementary/elm_toolbar.c +++ b/src/lib/elementary/elm_toolbar.c @@ -2235,21 +2235,21 @@ static void _scroll_cb(Evas_Object *obj, void *data EINA_UNUSED) { - efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL, NULL); + efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_CHANGED, NULL); } static void _scroll_anim_start_cb(Evas_Object *obj, void *data EINA_UNUSED) { - efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_ANIM_START, NULL); + efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_ANIM_STARTED, NULL); } static void _scroll_anim_stop_cb(Evas_Object *obj, void *data EINA_UNUSED) { - efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_ANIM_STOP, NULL); + efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_ANIM_FINISHED, NULL); } static void @@ -2259,14 +2259,14 @@ _scroll_drag_start_cb(Evas_Object *obj, ELM_TOOLBAR_DATA_GET(obj, sd); ELM_SAFE_FREE(sd->long_timer, ecore_timer_del); - efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_DRAG_START, NULL); + efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_DRAG_STARTED, NULL); } static void _scroll_drag_stop_cb(Evas_Object *obj, void *data EINA_UNUSED) { - efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL); + efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_DRAG_FINISHED, NULL); } static void diff --git a/src/tests/elementary/efl_ui_test_grid.c b/src/tests/elementary/efl_ui_test_grid.c index 9eaa096ad0..7ec1763545 100644 --- a/src/tests/elementary/efl_ui_test_grid.c +++ b/src/tests/elementary/efl_ui_test_grid.c @@ -257,13 +257,13 @@ grid_timer_cb(void *data EINA_UNUSED, const Efl_Event *event) } static void -grid_scroll_start_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED) +grid_scroll_started_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED) { //printf("LSH :: scroll start!!!\n"); } static void -grid_scroll_stop_cb(void *data, const Efl_Event *event EINA_UNUSED) +grid_scroll_finished_cb(void *data, const Efl_Event *event EINA_UNUSED) { Efl_Loop_Timer *timer = data; efl_del(timer); @@ -271,8 +271,8 @@ grid_scroll_stop_cb(void *data, const Efl_Event *event EINA_UNUSED) } EFL_CALLBACKS_ARRAY_DEFINE(grid_scroll_callbacks, - { EFL_UI_EVENT_SCROLL_START, grid_scroll_start_cb }, - { EFL_UI_EVENT_SCROLL_STOP, grid_scroll_stop_cb }); + { EFL_UI_EVENT_SCROLL_STARTED, grid_scroll_started_cb }, + { EFL_UI_EVENT_SCROLL_FINISHED, grid_scroll_finished_cb }); EFL_START_TEST(efl_ui_grid_scroll) { diff --git a/src/tests/elementary/efl_ui_test_scroller.c b/src/tests/elementary/efl_ui_test_scroller.c index eeb9a84fd2..e1aa4ef53b 100644 --- a/src/tests/elementary/efl_ui_test_scroller.c +++ b/src/tests/elementary/efl_ui_test_scroller.c @@ -7,11 +7,11 @@ #include "efl_ui_suite.h" static void -_startstop_event_cb(void *data, const Efl_Event *ev EINA_UNUSED) +_startfinish_event_cb(void *data, const Efl_Event *ev EINA_UNUSED) { int *called = data; (*called)++; - /* start/stop always come in pairs */ + /* start/finish always come in pairs */ if (*called == 2) ecore_main_loop_quit(); } @@ -24,8 +24,8 @@ EFL_START_TEST(efl_ui_test_scroller_events) sc = efl_add(EFL_UI_SCROLLER_CLASS, win, - efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_START, _startstop_event_cb, &called), - efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_STOP, _startstop_event_cb, &called), + efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_STARTED, _startfinish_event_cb, &called), + efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_FINISHED, _startfinish_event_cb, &called), efl_gfx_entity_size_set(efl_added, EINA_SIZE2D(500, 500)) ); @@ -52,8 +52,8 @@ EFL_START_TEST(efl_ui_test_scroller_events) sc2 = efl_add(EFL_UI_SCROLLER_CLASS, bx, efl_ui_scrollable_match_content_set(efl_added, EINA_FALSE, EINA_TRUE), - efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_START, _startstop_event_cb, &called2), - efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_STOP, _startstop_event_cb, &called2), + efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_STARTED, _startfinish_event_cb, &called2), + efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_FINISHED, _startfinish_event_cb, &called2), efl_pack(bx, efl_added)); bx2 = efl_add(EFL_UI_BOX_CLASS, sc2, @@ -91,8 +91,8 @@ EFL_START_TEST(efl_ui_test_scroller_events) sc3 = efl_add(EFL_UI_SCROLLER_CLASS, win, efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), - efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_START, _startstop_event_cb, &called3), - efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_STOP, _startstop_event_cb, &called3), + efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_STARTED, _startfinish_event_cb, &called3), + efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_FINISHED, _startfinish_event_cb, &called3), efl_pack_table(gd, efl_added, 0, 0, 1, 1)); gd2 = efl_add(EFL_UI_TABLE_CLASS, sc3,