bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=71c390e6a225d64a54d78346bd8da7f617a61432
commit 71c390e6a225d64a54d78346bd8da7f617a61432 Author: Mike Blumenkrantz <[email protected]> Date: Thu Feb 21 14:09:41 2019 -0500 api: efl.gfx.stack stack,changed -> stacking,changed slight tweak to make this more consistent with meaning and docs ref T7560 Reviewed-by: Marcel Hollerbach <[email protected]> Differential Revision: https://phab.enlightenment.org/D7988 --- src/lib/efl/interfaces/efl_gfx_stack.eo | 2 +- src/lib/elementary/efl_ui_widget.c | 2 +- src/lib/evas/canvas/efl_canvas_event_grabber.c | 6 +++--- src/lib/evas/canvas/evas_callbacks.c | 2 +- src/lib/evas/canvas/evas_object_inform.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lib/efl/interfaces/efl_gfx_stack.eo b/src/lib/efl/interfaces/efl_gfx_stack.eo index c65636133d..c2e8c8f776 100644 --- a/src/lib/efl/interfaces/efl_gfx_stack.eo +++ b/src/lib/efl/interfaces/efl_gfx_stack.eo @@ -129,6 +129,6 @@ interface @beta Efl.Gfx.Stack } } events { - stack,changed: void; [[Object stacking was changed.]] + stacking,changed: void; [[Object stacking was changed.]] } } diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c index 41eac8223f..c72ea15531 100644 --- a/src/lib/elementary/efl_ui_widget.c +++ b/src/lib/elementary/efl_ui_widget.c @@ -5809,7 +5809,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(widget_shadow_cb, { EFL_EVENT_DEL, _widget_shadow_del_cb }, { EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _widget_shadow_event_cb }, { EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _widget_shadow_event_cb }, -{ EFL_GFX_ENTITY_EVENT_STACK_CHANGED, _widget_shadow_event_cb }, +{ EFL_GFX_ENTITY_EVENT_STACKING_CHANGED, _widget_shadow_event_cb }, { EFL_GFX_ENTITY_EVENT_HIDE, _widget_shadow_event_cb }, { EFL_GFX_ENTITY_EVENT_SHOW, _widget_shadow_event_cb }) diff --git a/src/lib/evas/canvas/efl_canvas_event_grabber.c b/src/lib/evas/canvas/efl_canvas_event_grabber.c index 8e3e3e1886..c0563b0b57 100644 --- a/src/lib/evas/canvas/efl_canvas_event_grabber.c +++ b/src/lib/evas/canvas/efl_canvas_event_grabber.c @@ -246,7 +246,7 @@ _efl_canvas_event_grabber_efl_canvas_group_group_member_add(Eo *eo_obj, Efl_Obje _child_insert(pd, sub); efl_event_callback_add(eo_sub, EFL_EVENT_INVALIDATE, _efl_canvas_object_event_grabber_child_invalidate, pd); if (eo_sub != pd->rect) - efl_event_callback_add(eo_sub, EFL_GFX_ENTITY_EVENT_STACK_CHANGED, _efl_canvas_object_event_grabber_child_restack, pd); + efl_event_callback_add(eo_sub, EFL_GFX_ENTITY_EVENT_STACKING_CHANGED, _efl_canvas_object_event_grabber_child_restack, pd); } EOLIAN static void @@ -255,7 +255,7 @@ _efl_canvas_event_grabber_efl_canvas_group_group_member_del(Eo *eo_obj EINA_UNUS Evas_Object_Protected_Data *obj = efl_data_scope_get(member, EFL_CANVAS_OBJECT_CLASS); efl_event_callback_del(member, EFL_EVENT_INVALIDATE, _efl_canvas_object_event_grabber_child_invalidate, pd); - efl_event_callback_del(member, EFL_GFX_ENTITY_EVENT_STACK_CHANGED, _efl_canvas_object_event_grabber_child_restack, pd); + efl_event_callback_del(member, EFL_GFX_ENTITY_EVENT_STACKING_CHANGED, _efl_canvas_object_event_grabber_child_restack, pd); pd->contained = eina_list_remove(pd->contained, obj); EINA_COW_WRITE_BEGIN(evas_object_events_cow, obj->events, Evas_Object_Events_Data, events) @@ -350,7 +350,7 @@ _efl_canvas_event_grabber_efl_object_constructor(Eo *eo_obj, Efl_Object_Event_Gr obj->is_event_parent = 1; obj->is_smart = 0; - efl_event_callback_add(eo_obj, EFL_GFX_ENTITY_EVENT_STACK_CHANGED, _efl_canvas_object_event_grabber_restack, pd); + efl_event_callback_add(eo_obj, EFL_GFX_ENTITY_EVENT_STACKING_CHANGED, _efl_canvas_object_event_grabber_restack, pd); pd->rect = evas_object_rectangle_add(efl_parent_get(eo_obj)); evas_object_pointer_mode_set(pd->rect, EVAS_OBJECT_POINTER_MODE_NOGRAB); efl_parent_set(pd->rect, eo_obj); diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c index 3d7aadca4d..10c116a832 100644 --- a/src/lib/evas/canvas/evas_callbacks.c +++ b/src/lib/evas/canvas/evas_callbacks.c @@ -52,7 +52,7 @@ DEFINE_EVAS_CALLBACKS(_legacy_evas_callback_table, EVAS_CALLBACK_LAST, EFL_GFX_ENTITY_EVENT_HIDE, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, - EFL_GFX_ENTITY_EVENT_STACK_CHANGED, + EFL_GFX_ENTITY_EVENT_STACKING_CHANGED, EVAS_OBJECT_EVENT_DEL, EFL_EVENT_HOLD, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED, diff --git a/src/lib/evas/canvas/evas_object_inform.c b/src/lib/evas/canvas/evas_object_inform.c index ce3e6f55de..0b8581e32d 100644 --- a/src/lib/evas/canvas/evas_object_inform.c +++ b/src/lib/evas/canvas/evas_object_inform.c @@ -64,7 +64,7 @@ evas_object_inform_call_restack(Evas_Object *eo_obj, Evas_Object_Protected_Data { int event_id = _evas_object_event_new(); - evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_RESTACK, NULL, event_id, EFL_GFX_ENTITY_EVENT_STACK_CHANGED); + evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_RESTACK, NULL, event_id, EFL_GFX_ENTITY_EVENT_STACKING_CHANGED); if (obj->layer) _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id); } --
