orbea
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

edje: Rename events according to recent rename 

Ref T5315
This commit is contained in:
Jean-Philippe Andre 2017-12-07 10:24:08 +09:00
parent 3861f8b01d
commit fa786667b8
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/edje/edje_calc.c
View File

@ -926,7 +926,7 @@ _edje_recalc_do(Edje *ed)
if (!ed->calc_only) if (!ed->calc_only)
{ {
if (ed->recalc_call) 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 else
evas_object_smart_need_recalculate_set(ed->obj, need_calc); 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, strncat(depends_path, part_name,
sizeof(depends_path) - strlen(depends_path) - 1); 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", ERR("Circular dependency in the group '%s' : %s",
ed->group, depends_path); ed->group, depends_path);
eina_list_free(clist); eina_list_free(clist);

5
src/lib/edje/efl_canvas_layout.eo
View File

@ -10,7 +10,6 @@ class Efl.Canvas.Layout (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part,
{ {
[[Edje object class]] [[Edje object class]]
legacy_prefix: edje_object; legacy_prefix: edje_object;
event_prefix: edje_object;
data: Edje; data: Edje;
methods { methods {
@property animation { @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 { get; set; }
Efl.Player.play_speed { 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.]]
}
} }

6
src/lib/edje/efl_layout_calc.eo
View File

@ -10,6 +10,7 @@ interface Efl.Layout.Calc
@since 1.21 @since 1.21
]] ]]
event_prefix: efl_layout;
methods { methods {
@property calc_auto_update_hints { @property calc_auto_update_hints {
[[Whether this object updates its size hints automatically. [[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.]]
}
} }

6
src/lib/elementary/efl_ui_frame.c
View File

@ -69,7 +69,7 @@ _on_recalc_done(void *data,
ELM_WIDGET_DATA_GET_OR_RETURN(data, wd); ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
efl_event_callback_del 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; sd->anim = EINA_FALSE;
elm_layout_sizing_eval(data); elm_layout_sizing_eval(data);
@ -88,7 +88,7 @@ _on_frame_clicked(void *data,
if (sd->collapsible) 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"); elm_layout_signal_emit(data, "elm,action,toggle", "elm");
sd->collapsed++; sd->collapsed++;
sd->anim = EINA_TRUE; 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"); elm_layout_signal_emit(obj, "elm,action,toggle", "elm");
efl_event_callback_legacy_call efl_event_callback_legacy_call
(wd->resize_obj, EDJE_OBJECT_EVENT_RECALC, obj); (wd->resize_obj, EFL_LAYOUT_EVENT_RECALC, obj);
sd->collapsed = collapse; sd->collapsed = collapse;
elm_widget_tree_unfocusable_set(obj, sd->collapsed); elm_widget_tree_unfocusable_set(obj, sd->collapsed);
sd->anim = EINA_TRUE; sd->anim = EINA_TRUE;