jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=fa786667b8c95884e8879cfbed8ab58e92c5cb1a
commit fa786667b8c95884e8879cfbed8ab58e92c5cb1a Author: Jean-Philippe Andre <[email protected]> Date: Thu Dec 7 10:24:08 2017 +0900 edje: Rename events according to recent rename Ref T5315 --- src/lib/edje/edje_calc.c | 4 ++-- src/lib/edje/efl_canvas_layout.eo | 5 ----- src/lib/edje/efl_layout_calc.eo | 6 ++++++ src/lib/elementary/efl_ui_frame.c | 6 +++--- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c index a071c6107a..c2dbee503b 100644 --- a/src/lib/edje/edje_calc.c +++ b/src/lib/edje/edje_calc.c @@ -926,7 +926,7 @@ _edje_recalc_do(Edje *ed) if (!ed->calc_only) { if (ed->recalc_call) - efl_event_callback_legacy_call(ed->obj, EDJE_OBJECT_EVENT_RECALC, NULL); + efl_event_callback_legacy_call(ed->obj, EFL_LAYOUT_EVENT_RECALC, NULL); } else evas_object_smart_need_recalculate_set(ed->obj, need_calc); @@ -3845,7 +3845,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta strncat(depends_path, part_name, sizeof(depends_path) - strlen(depends_path) - 1); } - efl_event_callback_legacy_call(ed->obj, EDJE_OBJECT_EVENT_CIRCULAR_DEPENDENCY, clist); + efl_event_callback_legacy_call(ed->obj, EFL_LAYOUT_EVENT_CIRCULAR_DEPENDENCY, clist); ERR("Circular dependency in the group '%s' : %s", ed->group, depends_path); eina_list_free(clist); diff --git a/src/lib/edje/efl_canvas_layout.eo b/src/lib/edje/efl_canvas_layout.eo index b6cb5b7543..d50960a350 100644 --- a/src/lib/edje/efl_canvas_layout.eo +++ b/src/lib/edje/efl_canvas_layout.eo @@ -10,7 +10,6 @@ class Efl.Canvas.Layout (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part, { [[Edje object class]] legacy_prefix: edje_object; - event_prefix: edje_object; data: Edje; methods { @property animation { @@ -134,8 +133,4 @@ class Efl.Canvas.Layout (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part, Efl.Player.play { get; set; } Efl.Player.play_speed { get; set; } } - events { - recalc; [[Edje re-calculated the object.]] - circular,dependency; [[Edje found circular dependencies between parts of the object.]] - } } diff --git a/src/lib/edje/efl_layout_calc.eo b/src/lib/edje/efl_layout_calc.eo index d196e9a278..77852fefff 100644 --- a/src/lib/edje/efl_layout_calc.eo +++ b/src/lib/edje/efl_layout_calc.eo @@ -10,6 +10,7 @@ interface Efl.Layout.Calc @since 1.21 ]] + event_prefix: efl_layout; methods { @property calc_auto_update_hints { [[Whether this object updates its size hints automatically. @@ -106,4 +107,9 @@ interface Efl.Layout.Calc ]] } } + events { + recalc; [[The layout was recalculated.]] + circular,dependency; [[A circular dependency between parts of the + object was found.]] + } } diff --git a/src/lib/elementary/efl_ui_frame.c b/src/lib/elementary/efl_ui_frame.c index b1cab58135..20439889d5 100644 --- a/src/lib/elementary/efl_ui_frame.c +++ b/src/lib/elementary/efl_ui_frame.c @@ -69,7 +69,7 @@ _on_recalc_done(void *data, ELM_WIDGET_DATA_GET_OR_RETURN(data, wd); efl_event_callback_del - (wd->resize_obj, EDJE_OBJECT_EVENT_RECALC, _recalc, data); + (wd->resize_obj, EFL_LAYOUT_EVENT_RECALC, _recalc, data); sd->anim = EINA_FALSE; elm_layout_sizing_eval(data); @@ -88,7 +88,7 @@ _on_frame_clicked(void *data, if (sd->collapsible) { - efl_event_callback_add(wd->resize_obj, EDJE_OBJECT_EVENT_RECALC, _recalc, data); + efl_event_callback_add(wd->resize_obj, EFL_LAYOUT_EVENT_RECALC, _recalc, data); elm_layout_signal_emit(data, "elm,action,toggle", "elm"); sd->collapsed++; sd->anim = EINA_TRUE; @@ -193,7 +193,7 @@ _efl_ui_frame_collapse_go(Eo *obj, Efl_Ui_Frame_Data *sd, Eina_Bool collapse) elm_layout_signal_emit(obj, "elm,action,toggle", "elm"); efl_event_callback_legacy_call - (wd->resize_obj, EDJE_OBJECT_EVENT_RECALC, obj); + (wd->resize_obj, EFL_LAYOUT_EVENT_RECALC, obj); sd->collapsed = collapse; elm_widget_tree_unfocusable_set(obj, sd->collapsed); sd->anim = EINA_TRUE; --
