From 94efabedf6475a665352ff30f4b869c5a310eb40 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 21 Feb 2019 18:19:42 +0100 Subject: [PATCH] efl.gfx.stack: restack -> stack,changed Summary: ref T7560 Depends on D7967 Reviewers: segfaultxavi Reviewed By: segfaultxavi Subscribers: cedric, #reviewers, #committers Tags: #efl_api Maniphest Tasks: T7560 Differential Revision: https://phab.enlightenment.org/D7968 --- 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 56bdde626f..c65636133d 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 { - restack: void; [[Object stacking was changed.]] + stack,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 5840051086..92c4033168 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_MOVE, _widget_shadow_event_cb }, { EFL_GFX_ENTITY_EVENT_RESIZE, _widget_shadow_event_cb }, -{ EFL_GFX_ENTITY_EVENT_RESTACK, _widget_shadow_event_cb }, +{ EFL_GFX_ENTITY_EVENT_STACK_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 1cfde42693..8e3e3e1886 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_RESTACK, _efl_canvas_object_event_grabber_child_restack, pd); + efl_event_callback_add(eo_sub, EFL_GFX_ENTITY_EVENT_STACK_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_RESTACK, _efl_canvas_object_event_grabber_child_restack, pd); + efl_event_callback_del(member, EFL_GFX_ENTITY_EVENT_STACK_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_RESTACK, _efl_canvas_object_event_grabber_restack, pd); + efl_event_callback_add(eo_obj, EFL_GFX_ENTITY_EVENT_STACK_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 6c55790d1c..25894bbd7a 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_MOVE, EFL_GFX_ENTITY_EVENT_RESIZE, - EFL_GFX_ENTITY_EVENT_RESTACK, + EFL_GFX_ENTITY_EVENT_STACK_CHANGED, EVAS_OBJECT_EVENT_DEL, EFL_EVENT_HOLD, EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS, diff --git a/src/lib/evas/canvas/evas_object_inform.c b/src/lib/evas/canvas/evas_object_inform.c index 8fb780e66c..3eb729f50e 100644 --- a/src/lib/evas/canvas/evas_object_inform.c +++ b/src/lib/evas/canvas/evas_object_inform.c @@ -45,7 +45,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_RESTACK); + evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_RESTACK, NULL, event_id, EFL_GFX_ENTITY_EVENT_STACK_CHANGED); if (obj->layer) _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id); }