summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-12-07 10:24:08 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-12-07 10:24:08 +0900
commitfa786667b8c95884e8879cfbed8ab58e92c5cb1a (patch)
tree001b3ff50b26637809db27371b0389dcfb3faa68 /src
parent3861f8b01d9dd213fd966b178dcdaf71110e2d76 (diff)
edje: Rename events according to recent rename
Ref T5315
Diffstat (limited to 'src')
-rw-r--r--src/lib/edje/edje_calc.c4
-rw-r--r--src/lib/edje/efl_canvas_layout.eo5
-rw-r--r--src/lib/edje/efl_layout_calc.eo6
-rw-r--r--src/lib/elementary/efl_ui_frame.c6
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)
926 if (!ed->calc_only) 926 if (!ed->calc_only)
927 { 927 {
928 if (ed->recalc_call) 928 if (ed->recalc_call)
929 efl_event_callback_legacy_call(ed->obj, EDJE_OBJECT_EVENT_RECALC, NULL); 929 efl_event_callback_legacy_call(ed->obj, EFL_LAYOUT_EVENT_RECALC, NULL);
930 } 930 }
931 else 931 else
932 evas_object_smart_need_recalculate_set(ed->obj, need_calc); 932 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
3845 strncat(depends_path, part_name, 3845 strncat(depends_path, part_name,
3846 sizeof(depends_path) - strlen(depends_path) - 1); 3846 sizeof(depends_path) - strlen(depends_path) - 1);
3847 } 3847 }
3848 efl_event_callback_legacy_call(ed->obj, EDJE_OBJECT_EVENT_CIRCULAR_DEPENDENCY, clist); 3848 efl_event_callback_legacy_call(ed->obj, EFL_LAYOUT_EVENT_CIRCULAR_DEPENDENCY, clist);
3849 ERR("Circular dependency in the group '%s' : %s", 3849 ERR("Circular dependency in the group '%s' : %s",
3850 ed->group, depends_path); 3850 ed->group, depends_path);
3851 eina_list_free(clist); 3851 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,
10{ 10{
11 [[Edje object class]] 11 [[Edje object class]]
12 legacy_prefix: edje_object; 12 legacy_prefix: edje_object;
13 event_prefix: edje_object;
14 data: Edje; 13 data: Edje;
15 methods { 14 methods {
16 @property animation { 15 @property animation {
@@ -134,8 +133,4 @@ class Efl.Canvas.Layout (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part,
134 Efl.Player.play { get; set; } 133 Efl.Player.play { get; set; }
135 Efl.Player.play_speed { get; set; } 134 Efl.Player.play_speed { get; set; }
136 } 135 }
137 events {
138 recalc; [[Edje re-calculated the object.]]
139 circular,dependency; [[Edje found circular dependencies between parts of the object.]]
140 }
141} 136}
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
10 10
11 @since 1.21 11 @since 1.21
12 ]] 12 ]]
13 event_prefix: efl_layout;
13 methods { 14 methods {
14 @property calc_auto_update_hints { 15 @property calc_auto_update_hints {
15 [[Whether this object updates its size hints automatically. 16 [[Whether this object updates its size hints automatically.
@@ -106,4 +107,9 @@ interface Efl.Layout.Calc
106 ]] 107 ]]
107 } 108 }
108 } 109 }
110 events {
111 recalc; [[The layout was recalculated.]]
112 circular,dependency; [[A circular dependency between parts of the
113 object was found.]]
114 }
109} 115}
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,
69 ELM_WIDGET_DATA_GET_OR_RETURN(data, wd); 69 ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
70 70
71 efl_event_callback_del 71 efl_event_callback_del
72 (wd->resize_obj, EDJE_OBJECT_EVENT_RECALC, _recalc, data); 72 (wd->resize_obj, EFL_LAYOUT_EVENT_RECALC, _recalc, data);
73 sd->anim = EINA_FALSE; 73 sd->anim = EINA_FALSE;
74 74
75 elm_layout_sizing_eval(data); 75 elm_layout_sizing_eval(data);
@@ -88,7 +88,7 @@ _on_frame_clicked(void *data,
88 88
89 if (sd->collapsible) 89 if (sd->collapsible)
90 { 90 {
91 efl_event_callback_add(wd->resize_obj, EDJE_OBJECT_EVENT_RECALC, _recalc, data); 91 efl_event_callback_add(wd->resize_obj, EFL_LAYOUT_EVENT_RECALC, _recalc, data);
92 elm_layout_signal_emit(data, "elm,action,toggle", "elm"); 92 elm_layout_signal_emit(data, "elm,action,toggle", "elm");
93 sd->collapsed++; 93 sd->collapsed++;
94 sd->anim = EINA_TRUE; 94 sd->anim = EINA_TRUE;
@@ -193,7 +193,7 @@ _efl_ui_frame_collapse_go(Eo *obj, Efl_Ui_Frame_Data *sd, Eina_Bool collapse)
193 193
194 elm_layout_signal_emit(obj, "elm,action,toggle", "elm"); 194 elm_layout_signal_emit(obj, "elm,action,toggle", "elm");
195 efl_event_callback_legacy_call 195 efl_event_callback_legacy_call
196 (wd->resize_obj, EDJE_OBJECT_EVENT_RECALC, obj); 196 (wd->resize_obj, EFL_LAYOUT_EVENT_RECALC, obj);
197 sd->collapsed = collapse; 197 sd->collapsed = collapse;
198 elm_widget_tree_unfocusable_set(obj, sd->collapsed); 198 elm_widget_tree_unfocusable_set(obj, sd->collapsed);
199 sd->anim = EINA_TRUE; 199 sd->anim = EINA_TRUE;