summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-07-30 13:11:19 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-07-30 13:12:52 -0400
commitadc510f9eec2c6a5807b936f261ae5cdce0d36b4 (patch)
treef3ec520f342294ca0608294d49c68386b36974bf /src/lib
parent6883087ac7dac530062b24b5ea918904589a89c2 (diff)
efl_ui: change calls to elm_layout_sizing_eval to efl_canvas_group_change
Summary: elm_layout_sizing_eval is a legacy function which should not need to be called on new widgets Reviewers: segfaultxavi, bu5hm4n Reviewed By: bu5hm4n Subscribers: segfaultxavi, cedric, #reviewers, #committers Tags: #efl_widgets Maniphest Tasks: T8059 Differential Revision: https://phab.enlightenment.org/D9434
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/elementary/efl_ui_alert_popup.c4
-rw-r--r--src/lib/elementary/efl_ui_anchor_popup.c8
-rw-r--r--src/lib/elementary/efl_ui_button.c2
-rw-r--r--src/lib/elementary/efl_ui_check.c4
-rw-r--r--src/lib/elementary/efl_ui_clock.c6
-rw-r--r--src/lib/elementary/efl_ui_frame.c6
-rw-r--r--src/lib/elementary/efl_ui_image.c2
-rw-r--r--src/lib/elementary/efl_ui_item.c4
-rw-r--r--src/lib/elementary/efl_ui_layout.c29
-rw-r--r--src/lib/elementary/efl_ui_list_view.c2
-rw-r--r--src/lib/elementary/efl_ui_panel.c12
-rw-r--r--src/lib/elementary/efl_ui_panes.c8
-rw-r--r--src/lib/elementary/efl_ui_popup.c10
-rw-r--r--src/lib/elementary/efl_ui_progressbar.c10
-rw-r--r--src/lib/elementary/efl_ui_radio.c6
-rw-r--r--src/lib/elementary/efl_ui_scroll_alert_popup.c6
-rw-r--r--src/lib/elementary/efl_ui_scroll_util.c4
-rw-r--r--src/lib/elementary/efl_ui_scroller.c8
-rw-r--r--src/lib/elementary/efl_ui_spin.c4
-rw-r--r--src/lib/elementary/efl_ui_spin_button.c1
-rw-r--r--src/lib/elementary/efl_ui_tags.c3
-rw-r--r--src/lib/elementary/efl_ui_text.c13
-rw-r--r--src/lib/elementary/efl_ui_text_alert_popup.c8
-rw-r--r--src/lib/elementary/efl_ui_video.c4
24 files changed, 68 insertions, 96 deletions
diff --git a/src/lib/elementary/efl_ui_alert_popup.c b/src/lib/elementary/efl_ui_alert_popup.c
index b80e6e6388..c671754be9 100644
--- a/src/lib/elementary/efl_ui_alert_popup.c
+++ b/src/lib/elementary/efl_ui_alert_popup.c
@@ -41,7 +41,7 @@ _efl_ui_alert_popup_text_set(Eo *obj, Efl_Ui_Alert_Popup_Data *pd, const char *p
41 41
42 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 42 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
43 edje_object_message_signal_process(wd->resize_obj); 43 edje_object_message_signal_process(wd->resize_obj);
44 elm_layout_sizing_eval(obj); 44 efl_canvas_group_change(obj);
45 } 45 }
46 } 46 }
47 else 47 else
@@ -228,7 +228,7 @@ _efl_ui_alert_popup_button_set(Eo *obj, Efl_Ui_Alert_Popup_Data *pd, Efl_Ui_Aler
228 edje_object_message_signal_process(wd->resize_obj); 228 edje_object_message_signal_process(wd->resize_obj);
229 } 229 }
230 230
231 elm_layout_sizing_eval(obj); 231 efl_canvas_group_change(obj);
232} 232}
233 233
234EOLIAN static Eo * 234EOLIAN static Eo *
diff --git a/src/lib/elementary/efl_ui_anchor_popup.c b/src/lib/elementary/efl_ui_anchor_popup.c
index ec0573be4c..5709956dfd 100644
--- a/src/lib/elementary/efl_ui_anchor_popup.c
+++ b/src/lib/elementary/efl_ui_anchor_popup.c
@@ -211,7 +211,8 @@ _anchor_del_cb(void *data, const Efl_Event *ev EINA_UNUSED)
211 pd->anchor = NULL; 211 pd->anchor = NULL;
212 //Add align calc only 212 //Add align calc only
213 Eina_Bool needs_size_calc = ppd->needs_size_calc; 213 Eina_Bool needs_size_calc = ppd->needs_size_calc;
214 elm_layout_sizing_eval(data); 214 efl_canvas_group_change(data);
215 efl_canvas_group_calculate(data);
215 ppd->needs_size_calc = needs_size_calc; 216 ppd->needs_size_calc = needs_size_calc;
216} 217}
217 218
@@ -247,7 +248,8 @@ _efl_ui_anchor_popup_anchor_set(Eo *obj, Efl_Ui_Anchor_Popup_Data *pd, Eo *ancho
247 248
248 //Add align/anchor calc only 249 //Add align/anchor calc only
249 Eina_Bool needs_size_calc = ppd->needs_size_calc; 250 Eina_Bool needs_size_calc = ppd->needs_size_calc;
250 elm_layout_sizing_eval(obj); 251 efl_canvas_group_change(obj);
252 efl_canvas_group_calculate(obj);
251 ppd->needs_size_calc = needs_size_calc; 253 ppd->needs_size_calc = needs_size_calc;
252} 254}
253 255
@@ -303,7 +305,7 @@ EOLIAN static void
303_efl_ui_anchor_popup_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Anchor_Popup_Data *pd) 305_efl_ui_anchor_popup_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Anchor_Popup_Data *pd)
304{ 306{
305 EFL_UI_POPUP_DATA_GET_OR_RETURN(obj, ppd); 307 EFL_UI_POPUP_DATA_GET_OR_RETURN(obj, ppd);
306 /* When elm_layout_sizing_eval() is called, just flag is set instead of size 308 /* When efl_canvas_group_change() is called, just flag is set instead of size
307 * calculation. 309 * calculation.
308 * The actual size calculation is done here when the object is rendered to 310 * The actual size calculation is done here when the object is rendered to
309 * avoid duplicate size calculations. */ 311 * avoid duplicate size calculations. */
diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c
index 834e00f43d..b818ded895 100644
--- a/src/lib/elementary/efl_ui_button.c
+++ b/src/lib/elementary/efl_ui_button.c
@@ -422,7 +422,7 @@ _icon_signal_emit(Evas_Object *obj)
422 422
423 elm_layout_signal_emit(obj, buf, "elm"); 423 elm_layout_signal_emit(obj, buf, "elm");
424 edje_object_message_signal_process(elm_layout_edje_get(obj)); 424 edje_object_message_signal_process(elm_layout_edje_get(obj));
425 elm_layout_sizing_eval(obj); 425 efl_canvas_group_change(obj);
426} 426}
427 427
428/* FIXME: replicated from elm_layout just because button's icon spot 428/* FIXME: replicated from elm_layout just because button's icon spot
diff --git a/src/lib/elementary/efl_ui_check.c b/src/lib/elementary/efl_ui_check.c
index a5072728ea..4d6ab65cb1 100644
--- a/src/lib/elementary/efl_ui_check.c
+++ b/src/lib/elementary/efl_ui_check.c
@@ -176,8 +176,6 @@ _efl_ui_check_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Check_Data *sd EINA_UNUS
176 176
177 edje_object_message_signal_process(wd->resize_obj); 177 edje_object_message_signal_process(wd->resize_obj);
178 178
179 elm_layout_sizing_eval(obj);
180
181 return int_ret; 179 return int_ret;
182} 180}
183 181
@@ -453,7 +451,7 @@ _icon_signal_emit(Evas_Object *obj)
453 elm_layout_signal_emit(obj, buf, "elm"); 451 elm_layout_signal_emit(obj, buf, "elm");
454 edje_object_message_signal_process(wd->resize_obj); 452 edje_object_message_signal_process(wd->resize_obj);
455 453
456 elm_layout_sizing_eval(obj); 454 efl_canvas_group_change(obj);
457} 455}
458 456
459/* FIXME: replicated from elm_layout just because check's icon spot 457/* FIXME: replicated from elm_layout just because check's icon spot
diff --git a/src/lib/elementary/efl_ui_clock.c b/src/lib/elementary/efl_ui_clock.c
index 5a86dcdc26..efc62225f7 100644
--- a/src/lib/elementary/efl_ui_clock.c
+++ b/src/lib/elementary/efl_ui_clock.c
@@ -291,7 +291,7 @@ _field_list_arrange(Evas_Object *obj)
291 } 291 }
292 sd->freeze_sizing = freeze; 292 sd->freeze_sizing = freeze;
293 293
294 elm_layout_sizing_eval(obj); 294 efl_canvas_group_change(obj);
295 _field_list_display(obj); 295 _field_list_display(obj);
296} 296}
297 297
@@ -571,7 +571,6 @@ _efl_ui_clock_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Clock_Data *sd)
571 } 571 }
572 572
573 edje_object_message_signal_process(wd->resize_obj); 573 edje_object_message_signal_process(wd->resize_obj);
574 elm_layout_sizing_eval(obj);
575 574
576 return int_ret; 575 return int_ret;
577} 576}
@@ -903,7 +902,6 @@ _efl_ui_clock_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Clock_Data *priv)
903 elm_widget_can_focus_set(obj, EINA_TRUE); 902 elm_widget_can_focus_set(obj, EINA_TRUE);
904 903
905 priv->freeze_sizing = EINA_FALSE; 904 priv->freeze_sizing = EINA_FALSE;
906 elm_layout_sizing_eval(obj);
907 905
908 // ACCESS 906 // ACCESS
909 if (_elm_config->access_mode == ELM_ACCESS_MODE_ON) 907 if (_elm_config->access_mode == ELM_ACCESS_MODE_ON)
@@ -1044,7 +1042,7 @@ _efl_ui_clock_field_visible_set(Eo *obj, Efl_Ui_Clock_Data *sd, Efl_Ui_Clock_Typ
1044 } 1042 }
1045 sd->freeze_sizing = EINA_FALSE; 1043 sd->freeze_sizing = EINA_FALSE;
1046 1044
1047 elm_layout_sizing_eval(obj); 1045 efl_canvas_group_change(obj);
1048 1046
1049 if (!visible) return; 1047 if (!visible) return;
1050 { 1048 {
diff --git a/src/lib/elementary/efl_ui_frame.c b/src/lib/elementary/efl_ui_frame.c
index a47a8669dd..c614ef5508 100644
--- a/src/lib/elementary/efl_ui_frame.c
+++ b/src/lib/elementary/efl_ui_frame.c
@@ -45,7 +45,7 @@ _sizing_eval(Evas_Object *obj,
45static void 45static void
46_recalc(void *data, const Efl_Event *event EINA_UNUSED) 46_recalc(void *data, const Efl_Event *event EINA_UNUSED)
47{ 47{
48 elm_layout_sizing_eval(data); 48 efl_canvas_group_calculate(data);
49} 49}
50 50
51static void 51static void
@@ -61,7 +61,7 @@ _on_recalc_done(void *data,
61 (wd->resize_obj, EFL_LAYOUT_EVENT_RECALC, _recalc, data); 61 (wd->resize_obj, EFL_LAYOUT_EVENT_RECALC, _recalc, data);
62 sd->anim = EINA_FALSE; 62 sd->anim = EINA_FALSE;
63 63
64 elm_layout_sizing_eval(data); 64 efl_canvas_group_calculate(data);
65} 65}
66 66
67static void 67static void
@@ -158,8 +158,6 @@ _efl_ui_frame_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Frame_Data *_pd EINA_UN
158 elm_widget_theme_element_get(obj), 158 elm_widget_theme_element_get(obj),
159 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC) 159 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
160 CRI("Failed to set layout!"); 160 CRI("Failed to set layout!");
161
162 elm_layout_sizing_eval(obj);
163} 161}
164 162
165EOLIAN static Eo * 163EOLIAN static Eo *
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index 4f79fb0c2d..239a099064 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -1281,7 +1281,7 @@ _efl_ui_image_efl_layout_calc_calc_thaw(Eo *obj, Efl_Ui_Image_Data *sd)
1281 if (sd->edje) 1281 if (sd->edje)
1282 { 1282 {
1283 int ret = edje_object_thaw(sd->img); 1283 int ret = edje_object_thaw(sd->img);
1284 elm_layout_sizing_eval(obj); 1284 efl_canvas_group_calculate(obj);
1285 return ret; 1285 return ret;
1286 } 1286 }
1287 return 0; 1287 return 0;
diff --git a/src/lib/elementary/efl_ui_item.c b/src/lib/elementary/efl_ui_item.c
index 26911a3a73..65ecf71cb0 100644
--- a/src/lib/elementary/efl_ui_item.c
+++ b/src/lib/elementary/efl_ui_item.c
@@ -28,7 +28,7 @@ _efl_ui_item_part_text_efl_text_text_set(Eo *obj, void *pd EINA_UNUSED, const ch
28 Elm_Part_Data *wd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); 28 Elm_Part_Data *wd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
29 efl_text_set(efl_part(efl_super(wd->obj, MY_CLASS), wd->part), text); 29 efl_text_set(efl_part(efl_super(wd->obj, MY_CLASS), wd->part), text);
30 30
31 elm_layout_sizing_eval(wd->obj); 31 efl_canvas_group_change(wd->obj);
32} 32}
33 33
34EOLIAN static const char* 34EOLIAN static const char*
@@ -44,7 +44,7 @@ _efl_ui_item_part_text_efl_text_markup_markup_set(Eo *obj, void *pd EINA_UNUSED,
44 Elm_Part_Data *wd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); 44 Elm_Part_Data *wd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
45 efl_text_markup_set(efl_part(efl_super(wd->obj, MY_CLASS), wd->part), markup); 45 efl_text_markup_set(efl_part(efl_super(wd->obj, MY_CLASS), wd->part), markup);
46 46
47 elm_layout_sizing_eval(obj); 47 efl_canvas_group_change(obj);
48} 48}
49 49
50EOLIAN static const char* 50EOLIAN static const char*
diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c
index 1390fc774f..ad26dbe59d 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -146,7 +146,7 @@ _on_sub_object_size_hint_change(void *data,
146{ 146{
147 if (!efl_alive_get(data)) return; 147 if (!efl_alive_get(data)) return;
148 ELM_WIDGET_DATA_GET_OR_RETURN(data, wd); 148 ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
149 elm_layout_sizing_eval(data); 149 efl_canvas_group_change(data);
150} 150}
151 151
152static void 152static void
@@ -437,7 +437,7 @@ _visuals_refresh(Evas_Object *obj,
437 _efl_ui_layout_highlight_in_theme(obj); 437 _efl_ui_layout_highlight_in_theme(obj);
438 _flush_mirrored_state(obj); 438 _flush_mirrored_state(obj);
439 439
440 elm_layout_sizing_eval(obj); 440 efl_canvas_group_change(obj);
441 441
442 return EINA_TRUE; 442 return EINA_TRUE;
443} 443}
@@ -577,7 +577,7 @@ _efl_ui_layout_base_efl_ui_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Layout_D
577 577
578 // No need to resize object during destruction 578 // No need to resize object during destruction
579 if (wd->resize_obj && efl_alive_get(obj)) 579 if (wd->resize_obj && efl_alive_get(obj))
580 elm_layout_sizing_eval(obj); 580 efl_canvas_group_change(obj);
581 581
582 return EINA_TRUE; 582 return EINA_TRUE;
583} 583}
@@ -733,7 +733,8 @@ _on_size_evaluate_signal(void *data,
733 const char *emission EINA_UNUSED, 733 const char *emission EINA_UNUSED,
734 const char *source EINA_UNUSED) 734 const char *source EINA_UNUSED)
735{ 735{
736 elm_layout_sizing_eval(data); 736 efl_canvas_group_change(data);
737 efl_canvas_group_calculate(data);
737} 738}
738 739
739EOLIAN static void 740EOLIAN static void
@@ -1062,7 +1063,7 @@ _efl_ui_layout_content_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Ev
1062 _icon_signal_emit(sd, sub_d, EINA_TRUE); 1063 _icon_signal_emit(sd, sub_d, EINA_TRUE);
1063 } 1064 }
1064 1065
1065 elm_layout_sizing_eval(obj); 1066 efl_canvas_group_change(obj);
1066 1067
1067end: 1068end:
1068 return EINA_TRUE; 1069 return EINA_TRUE;
@@ -1262,7 +1263,7 @@ _efl_ui_layout_text_generic_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *par
1262 edje_object_part_text_escaped_set 1263 edje_object_part_text_escaped_set
1263 (wd->resize_obj, part, NULL); 1264 (wd->resize_obj, part, NULL);
1264 sd->subs = eina_list_remove_list(sd->subs, l); 1265 sd->subs = eina_list_remove_list(sd->subs, l);
1265 elm_layout_sizing_eval(obj); 1266 efl_canvas_group_change(obj);
1266 return EINA_TRUE; 1267 return EINA_TRUE;
1267 } 1268 }
1268 else 1269 else
@@ -1298,7 +1299,7 @@ _efl_ui_layout_text_generic_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *par
1298 1299
1299 _text_signal_emit(sd, sub_d, EINA_TRUE); 1300 _text_signal_emit(sd, sub_d, EINA_TRUE);
1300 1301
1301 elm_layout_sizing_eval(obj); 1302 efl_canvas_group_change(obj);
1302 1303
1303 if (_elm_config->access_mode == ELM_ACCESS_MODE_ON && 1304 if (_elm_config->access_mode == ELM_ACCESS_MODE_ON &&
1304 sd->can_access && !(sub_d->obj)) 1305 sd->can_access && !(sub_d->obj))
@@ -1397,7 +1398,7 @@ _efl_ui_layout_box_append(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Eva
1397 sub_d->type = BOX_APPEND; 1398 sub_d->type = BOX_APPEND;
1398 _layout_box_subobj_init(sd, sub_d, part, child); 1399 _layout_box_subobj_init(sd, sub_d, part, child);
1399 1400
1400 elm_layout_sizing_eval(obj); 1401 efl_canvas_group_change(obj);
1401 1402
1402 return EINA_TRUE; 1403 return EINA_TRUE;
1403} 1404}
@@ -1434,7 +1435,7 @@ _efl_ui_layout_box_prepend(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Ev
1434 sub_d->type = BOX_PREPEND; 1435 sub_d->type = BOX_PREPEND;
1435 _layout_box_subobj_init(sd, sub_d, part, child); 1436 _layout_box_subobj_init(sd, sub_d, part, child);
1436 1437
1437 elm_layout_sizing_eval(obj); 1438 efl_canvas_group_change(obj);
1438 1439
1439 return EINA_TRUE; 1440 return EINA_TRUE;
1440} 1441}
@@ -1476,7 +1477,7 @@ _efl_ui_layout_box_insert_before(Eo *obj, Efl_Ui_Layout_Data *sd, const char *pa
1476 evas_object_event_callback_add 1477 evas_object_event_callback_add
1477 ((Evas_Object *)reference, EVAS_CALLBACK_DEL, _box_reference_del, sub_d); 1478 ((Evas_Object *)reference, EVAS_CALLBACK_DEL, _box_reference_del, sub_d);
1478 1479
1479 elm_layout_sizing_eval(obj); 1480 efl_canvas_group_change(obj);
1480 1481
1481 return EINA_TRUE; 1482 return EINA_TRUE;
1482} 1483}
@@ -1514,7 +1515,7 @@ _efl_ui_layout_box_insert_at(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part,
1514 sub_d->p.box.pos = pos; 1515 sub_d->p.box.pos = pos;
1515 _layout_box_subobj_init(sd, sub_d, part, child); 1516 _layout_box_subobj_init(sd, sub_d, part, child);
1516 1517
1517 elm_layout_sizing_eval(obj); 1518 efl_canvas_group_change(obj);
1518 1519
1519 return EINA_TRUE; 1520 return EINA_TRUE;
1520} 1521}
@@ -1612,7 +1613,7 @@ _efl_ui_layout_table_pack(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Eva
1612 sd->subs = eina_list_append(sd->subs, sub_d); 1613 sd->subs = eina_list_append(sd->subs, sub_d);
1613 efl_parent_set(child, obj); 1614 efl_parent_set(child, obj);
1614 1615
1615 elm_layout_sizing_eval(obj); 1616 efl_canvas_group_change(obj);
1616 1617
1617 return EINA_TRUE; 1618 return EINA_TRUE;
1618} 1619}
@@ -1733,7 +1734,7 @@ elm_layout_sizing_restricted_eval(Eo *obj, Eina_Bool w, Eina_Bool h)
1733 sd->restricted_calc_w = !!w; 1734 sd->restricted_calc_w = !!w;
1734 sd->restricted_calc_h = !!h; 1735 sd->restricted_calc_h = !!h;
1735 1736
1736 evas_object_smart_changed(obj); 1737 efl_canvas_group_change(obj);
1737} 1738}
1738 1739
1739EOLIAN static int 1740EOLIAN static int
@@ -1757,7 +1758,7 @@ _efl_ui_layout_base_efl_layout_calc_calc_thaw(Eo *obj, Efl_Ui_Layout_Data *sd)
1757 1758
1758 edje_object_thaw(wd->resize_obj); 1759 edje_object_thaw(wd->resize_obj);
1759 1760
1760 elm_layout_sizing_eval(obj); 1761 efl_canvas_group_change(obj);
1761 1762
1762 return 0; 1763 return 0;
1763} 1764}
diff --git a/src/lib/elementary/efl_ui_list_view.c b/src/lib/elementary/efl_ui_list_view.c
index 219d2aa151..12bf65ad4c 100644
--- a/src/lib/elementary/efl_ui_list_view.c
+++ b/src/lib/elementary/efl_ui_list_view.c
@@ -626,8 +626,6 @@ _efl_ui_list_view_efl_canvas_group_group_add(Eo *obj, Efl_Ui_List_View_Data *pd)
626 _efl_ui_list_view_bar_hide_cb, obj); 626 _efl_ui_list_view_bar_hide_cb, obj);
627 627
628 _efl_ui_list_view_edje_object_attach(obj); 628 _efl_ui_list_view_edje_object_attach(obj);
629
630 elm_layout_sizing_eval(obj);
631} 629}
632 630
633EOLIAN static void 631EOLIAN static void
diff --git a/src/lib/elementary/efl_ui_panel.c b/src/lib/elementary/efl_ui_panel.c
index bfa7a9391d..eba318d102 100644
--- a/src/lib/elementary/efl_ui_panel.c
+++ b/src/lib/elementary/efl_ui_panel.c
@@ -239,9 +239,6 @@ _efl_ui_panel_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Panel_Data *sd)
239 efl_content_set(efl_part(efl_super(obj, MY_CLASS), "efl.swallow.event"), sd->event); 239 efl_content_set(efl_part(efl_super(obj, MY_CLASS), "efl.swallow.event"), sd->event);
240 } 240 }
241 241
242 if (efl_finalized_get(obj))
243 elm_layout_sizing_eval(obj);
244
245 return int_ret; 242 return int_ret;
246} 243}
247 244
@@ -740,8 +737,7 @@ _efl_ui_panel_efl_content_content_set(Eo *obj, Efl_Ui_Panel_Data *sd, Efl_Gfx_En
740 elm_widget_sub_object_add(sd->scr_ly, sd->content); 737 elm_widget_sub_object_add(sd->scr_ly, sd->content);
741 } 738 }
742 efl_event_callback_call(obj, EFL_CONTENT_EVENT_CONTENT_CHANGED, content); 739 efl_event_callback_call(obj, EFL_CONTENT_EVENT_CONTENT_CHANGED, content);
743 if (efl_alive_get(obj)) 740 efl_canvas_group_change(obj);
744 elm_layout_sizing_eval(obj);
745 741
746 return EINA_TRUE; 742 return EINA_TRUE;
747} 743}
@@ -790,8 +786,7 @@ _scrollable_layout_resize(Eo *obj, Efl_Ui_Panel_Data *sd, Evas_Coord w, Evas_Coo
790 evas_object_size_hint_min_set(sd->scr_event, w, h); 786 evas_object_size_hint_min_set(sd->scr_event, w, h);
791 break; 787 break;
792 } 788 }
793 if (efl_finalized_get(obj)) 789 efl_canvas_group_change(obj);
794 elm_layout_sizing_eval(obj);
795} 790}
796 791
797EOLIAN static void 792EOLIAN static void
@@ -950,8 +945,7 @@ _efl_ui_panel_orient_set(Eo *obj, Efl_Ui_Panel_Data *sd, Efl_Ui_Panel_Orient ori
950 else 945 else
951 _orient_set_do(obj); 946 _orient_set_do(obj);
952 947
953 if (efl_finalized_get(obj)) 948 efl_canvas_group_change(obj);
954 elm_layout_sizing_eval(obj);
955} 949}
956 950
957EOLIAN static Efl_Ui_Panel_Orient 951EOLIAN static Efl_Ui_Panel_Orient
diff --git a/src/lib/elementary/efl_ui_panes.c b/src/lib/elementary/efl_ui_panes.c
index e14d3de505..9d44173cc9 100644
--- a/src/lib/elementary/efl_ui_panes.c
+++ b/src/lib/elementary/efl_ui_panes.c
@@ -150,8 +150,6 @@ _efl_ui_panes_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Panes_Data *sd)
150 elm_layout_signal_emit(obj, "efl,panes,fixed", "efl"); 150 elm_layout_signal_emit(obj, "efl,panes,fixed", "efl");
151 } 151 }
152 152
153 elm_layout_sizing_eval(obj);
154
155 elm_panes_content_left_size_set(obj, size); 153 elm_panes_content_left_size_set(obj, size);
156 154
157 return int_ret; 155 return int_ret;
@@ -486,8 +484,6 @@ _efl_ui_panes_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Panes_Data *_pd EINA_UN
486 } 484 }
487 } 485 }
488 elm_widget_sub_object_add(obj, sd->event); 486 elm_widget_sub_object_add(obj, sd->event);
489
490 elm_layout_sizing_eval(obj);
491} 487}
492 488
493EOLIAN static Eo * 489EOLIAN static Eo *
@@ -628,13 +624,13 @@ _efl_ui_panes_part_hint_min_allow_set(Eo *obj, void *_pd EINA_UNUSED, Eina_Bool
628 { 624 {
629 if (sd->first_hint_min_allow == allow) return; 625 if (sd->first_hint_min_allow == allow) return;
630 sd->first_hint_min_allow = allow; 626 sd->first_hint_min_allow = allow;
631 elm_layout_sizing_eval(pd->obj); 627 efl_canvas_group_change(pd->obj);
632 } 628 }
633 else if (!strcmp(pd->part, "second")) 629 else if (!strcmp(pd->part, "second"))
634 { 630 {
635 if (sd->second_hint_min_allow == allow) return; 631 if (sd->second_hint_min_allow == allow) return;
636 sd->second_hint_min_allow = allow; 632 sd->second_hint_min_allow = allow;
637 elm_layout_sizing_eval(pd->obj); 633 efl_canvas_group_change(pd->obj);
638 } 634 }
639} 635}
640 636
diff --git a/src/lib/elementary/efl_ui_popup.c b/src/lib/elementary/efl_ui_popup.c
index 5d97a7d9c2..214758db9c 100644
--- a/src/lib/elementary/efl_ui_popup.c
+++ b/src/lib/elementary/efl_ui_popup.c
@@ -79,7 +79,7 @@ _efl_ui_popup_efl_gfx_entity_size_set(Eo *obj, Efl_Ui_Popup_Data *pd EINA_UNUSED
79{ 79{
80 efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), size); 80 efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), size);
81 81
82 elm_layout_sizing_eval(obj); 82 efl_canvas_group_change(obj);
83} 83}
84 84
85static void 85static void
@@ -91,7 +91,8 @@ _parent_geom_cb(void *data, const Efl_Event *ev EINA_UNUSED)
91 91
92 //Add align calc only 92 //Add align calc only
93 Eina_Bool needs_size_calc = pd->needs_size_calc; 93 Eina_Bool needs_size_calc = pd->needs_size_calc;
94 elm_layout_sizing_eval(obj); 94 efl_canvas_group_change(obj);
95 efl_canvas_group_calculate(obj);
95 pd->needs_size_calc = needs_size_calc; 96 pd->needs_size_calc = needs_size_calc;
96} 97}
97 98
@@ -133,7 +134,8 @@ _efl_ui_popup_align_set(Eo *obj EINA_UNUSED, Efl_Ui_Popup_Data *pd, Efl_Ui_Popup
133 134
134 //Add align calc only 135 //Add align calc only
135 Eina_Bool needs_size_calc = pd->needs_size_calc; 136 Eina_Bool needs_size_calc = pd->needs_size_calc;
136 elm_layout_sizing_eval(obj); 137 efl_canvas_group_change(obj);
138 efl_canvas_group_calculate(obj);
137 pd->needs_size_calc = needs_size_calc; 139 pd->needs_size_calc = needs_size_calc;
138} 140}
139 141
@@ -302,7 +304,7 @@ _efl_ui_popup_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Popup_Data *pd)
302EOLIAN static void 304EOLIAN static void
303_efl_ui_popup_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Popup_Data *pd) 305_efl_ui_popup_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Popup_Data *pd)
304{ 306{
305 /* When elm_layout_sizing_eval() is called, just flag is set instead of size 307 /* When efl_canvas_group_change() is called, just flag is set instead of size
306 * calculation. 308 * calculation.
307 * The actual size calculation is done here when the object is rendered to 309 * The actual size calculation is done here when the object is rendered to
308 * avoid duplicate size calculations. */ 310 * avoid duplicate size calculations. */
diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c
index 19b49bfa2e..00de86bbba 100644
--- a/src/lib/elementary/efl_ui_progressbar.c
+++ b/src/lib/elementary/efl_ui_progressbar.c
@@ -296,8 +296,6 @@ _efl_ui_progressbar_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Progressbar_Data *
296 296
297 edje_object_message_signal_process(wd->resize_obj); 297 edje_object_message_signal_process(wd->resize_obj);
298 298
299 elm_layout_sizing_eval(obj);
300
301 return int_ret; 299 return int_ret;
302} 300}
303 301
@@ -376,8 +374,6 @@ _efl_ui_progressbar_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Progressbar_Data
376 _units_set(obj); 374 _units_set(obj);
377 _val_set(obj); 375 _val_set(obj);
378 376
379 elm_layout_sizing_eval(obj);
380
381 if (_elm_config->access_mode == ELM_ACCESS_MODE_ON) 377 if (_elm_config->access_mode == ELM_ACCESS_MODE_ON)
382 elm_widget_can_focus_set(obj, EINA_TRUE); 378 elm_widget_can_focus_set(obj, EINA_TRUE);
383 379
@@ -469,7 +465,7 @@ _progressbar_span_size_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, Evas_Coord size
469 (sd->spacer, 1, (double)sd->size * efl_gfx_entity_scale_get(obj) * 465 (sd->spacer, 1, (double)sd->size * efl_gfx_entity_scale_get(obj) *
470 elm_config_scale_get()); 466 elm_config_scale_get());
471 467
472 elm_layout_sizing_eval(obj); 468 efl_canvas_group_change(obj);
473} 469}
474 470
475static void 471static void
@@ -761,7 +757,7 @@ _efl_ui_progressbar_show_progress_label_set(Eo *obj EINA_UNUSED, Efl_Ui_Progress
761 elm_layout_signal_emit(obj, signal_name, ns); 757 elm_layout_signal_emit(obj, signal_name, ns);
762 edje_object_message_signal_process(wd->resize_obj); 758 edje_object_message_signal_process(wd->resize_obj);
763 _units_set(obj); 759 _units_set(obj);
764 elm_layout_sizing_eval(obj); 760 efl_canvas_group_change(obj);
765} 761}
766 762
767EOLIAN static Eina_Bool 763EOLIAN static Eina_Bool
@@ -828,7 +824,7 @@ _icon_signal_emit(Evas_Object *obj)
828 824
829 elm_layout_signal_emit(obj, buf, "elm"); 825 elm_layout_signal_emit(obj, buf, "elm");
830 edje_object_message_signal_process(elm_layout_edje_get(obj)); 826 edje_object_message_signal_process(elm_layout_edje_get(obj));
831 elm_layout_sizing_eval(obj); 827 efl_canvas_group_change(obj);
832} 828}
833 829
834/* FIXME: replicated from elm_layout just because progressbar's icon spot 830/* FIXME: replicated from elm_layout just because progressbar's icon spot
diff --git a/src/lib/elementary/efl_ui_radio.c b/src/lib/elementary/efl_ui_radio.c
index edbc14844f..581a5c6319 100644
--- a/src/lib/elementary/efl_ui_radio.c
+++ b/src/lib/elementary/efl_ui_radio.c
@@ -176,8 +176,6 @@ _efl_ui_radio_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Radio_Data *sd EINA_UNUS
176 176
177 edje_object_message_signal_process(wd->resize_obj); 177 edje_object_message_signal_process(wd->resize_obj);
178 178
179 elm_layout_sizing_eval(obj);
180
181 return int_ret; 179 return int_ret;
182} 180}
183 181
@@ -233,8 +231,6 @@ _efl_ui_radio_efl_object_constructor(Eo *obj, Efl_Ui_Radio_Data *pd)
233 pd->group->radios = eina_list_append(pd->group->radios, obj); 231 pd->group->radios = eina_list_append(pd->group->radios, obj);
234 } 232 }
235 233
236 elm_layout_sizing_eval(obj);
237
238 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_RADIO_BUTTON); 234 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_RADIO_BUTTON);
239 _elm_access_text_set 235 _elm_access_text_set
240 (_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("Radio")); 236 (_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("Radio"));
@@ -357,7 +353,7 @@ _icon_signal_emit(Evas_Object *obj)
357 353
358 elm_layout_signal_emit(obj, buf, "elm"); 354 elm_layout_signal_emit(obj, buf, "elm");
359 edje_object_message_signal_process(edje); 355 edje_object_message_signal_process(edje);
360 elm_layout_sizing_eval(obj); 356 efl_canvas_group_change(obj);
361} 357}
362 358
363EOLIAN static Eina_Error 359EOLIAN static Eina_Error
diff --git a/src/lib/elementary/efl_ui_scroll_alert_popup.c b/src/lib/elementary/efl_ui_scroll_alert_popup.c
index 3ea05b1b2b..9836f8dfcb 100644
--- a/src/lib/elementary/efl_ui_scroll_alert_popup.c
+++ b/src/lib/elementary/efl_ui_scroll_alert_popup.c
@@ -133,7 +133,7 @@ _sizing_eval(Eo *obj, Efl_Ui_Scroll_Alert_Popup_Data *pd)
133EOLIAN static void 133EOLIAN static void
134_efl_ui_scroll_alert_popup_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Scroll_Alert_Popup_Data *pd) 134_efl_ui_scroll_alert_popup_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Scroll_Alert_Popup_Data *pd)
135{ 135{
136 /* When elm_layout_sizing_eval() is called, just flag is set instead of size 136 /* When efl_canvas_group_change() is called, just flag is set instead of size
137 * calculation. 137 * calculation.
138 * The actual size calculation is done here when the object is rendered to 138 * The actual size calculation is done here when the object is rendered to
139 * avoid duplicate size calculations. */ 139 * avoid duplicate size calculations. */
@@ -236,7 +236,7 @@ _efl_ui_scroll_alert_popup_expandable_set(Eo *obj EINA_UNUSED, Efl_Ui_Scroll_Ale
236 236
237 pd->max_size = max_size; 237 pd->max_size = max_size;
238 238
239 elm_layout_sizing_eval(obj); 239 efl_canvas_group_change(obj);
240} 240}
241 241
242static Eina_Size2D 242static Eina_Size2D
@@ -252,7 +252,7 @@ _efl_ui_scroll_alert_popup_efl_ui_popup_popup_size_set(Eo *obj, Efl_Ui_Scroll_Al
252 252
253 efl_gfx_entity_size_set(obj, size); 253 efl_gfx_entity_size_set(obj, size);
254 254
255 elm_layout_sizing_eval(obj); 255 efl_canvas_group_change(obj);
256} 256}
257 257
258EOLIAN static Eo * 258EOLIAN static Eo *
diff --git a/src/lib/elementary/efl_ui_scroll_util.c b/src/lib/elementary/efl_ui_scroll_util.c
index 45ba2d3f6e..f21ed184ae 100644
--- a/src/lib/elementary/efl_ui_scroll_util.c
+++ b/src/lib/elementary/efl_ui_scroll_util.c
@@ -214,14 +214,14 @@ static void
214_scroll_connector_resized_cb(void *data, const Efl_Event *ev EINA_UNUSED) 214_scroll_connector_resized_cb(void *data, const Efl_Event *ev EINA_UNUSED)
215{ 215{
216 Scroll_Connector_Context *ctx = data; 216 Scroll_Connector_Context *ctx = data;
217 elm_layout_sizing_eval(ctx->obj); 217 efl_canvas_group_change(ctx->obj);
218} 218}
219 219
220static void 220static void
221_scroll_connector_size_hint_changed_cb(void *data, const Efl_Event *ev EINA_UNUSED) 221_scroll_connector_size_hint_changed_cb(void *data, const Efl_Event *ev EINA_UNUSED)
222{ 222{
223 Scroll_Connector_Context *ctx = data; 223 Scroll_Connector_Context *ctx = data;
224 elm_layout_sizing_eval(ctx->obj); 224 efl_canvas_group_change(ctx->obj);
225} 225}
226 226
227void 227void
diff --git a/src/lib/elementary/efl_ui_scroller.c b/src/lib/elementary/efl_ui_scroller.c
index c731fe6572..b15e04e41b 100644
--- a/src/lib/elementary/efl_ui_scroller.c
+++ b/src/lib/elementary/efl_ui_scroller.c
@@ -184,7 +184,7 @@ _efl_ui_scroller_efl_content_content_set(Eo *obj,
184 184
185 efl_content_set(sd->pan_obj, content); 185 efl_content_set(sd->pan_obj, content);
186 186
187 elm_layout_sizing_eval(obj); 187 efl_canvas_group_change(obj);
188 188
189 return EINA_TRUE; 189 return EINA_TRUE;
190} 190}
@@ -214,7 +214,7 @@ _efl_ui_scroller_efl_content_content_unset(Eo *obj EINA_UNUSED, Efl_Ui_Scroller_
214static void 214static void
215_efl_ui_scroller_pan_resized_cb(void *data, const Efl_Event *ev EINA_UNUSED) 215_efl_ui_scroller_pan_resized_cb(void *data, const Efl_Event *ev EINA_UNUSED)
216{ 216{
217 elm_layout_sizing_eval(data); 217 efl_canvas_group_change(data);
218} 218}
219 219
220static void 220static void
@@ -351,8 +351,6 @@ _efl_ui_scroller_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Scroller_Data *sd)
351 351
352 efl_ui_mirrored_set(sd->smanager, efl_ui_mirrored_get(obj)); 352 efl_ui_mirrored_set(sd->smanager, efl_ui_mirrored_get(obj));
353 353
354 elm_layout_sizing_eval(obj);
355
356 return int_ret; 354 return int_ret;
357} 355}
358 356
@@ -367,7 +365,7 @@ _efl_ui_scroller_efl_ui_scrollable_interactive_match_content_set(Eo *obj EINA_UN
367 365
368 efl_ui_scrollable_match_content_set(sd->smanager, match_content_w, match_content_h); 366 efl_ui_scrollable_match_content_set(sd->smanager, match_content_w, match_content_h);
369 367
370 elm_layout_sizing_eval(obj); 368 efl_canvas_group_change(obj);
371} 369}
372 370
373EOLIAN static Eina_Bool 371EOLIAN static Eina_Bool
diff --git a/src/lib/elementary/efl_ui_spin.c b/src/lib/elementary/efl_ui_spin.c
index d6c717cb72..bbfeba78ef 100644
--- a/src/lib/elementary/efl_ui_spin.c
+++ b/src/lib/elementary/efl_ui_spin.c
@@ -85,8 +85,6 @@ _efl_ui_spin_efl_object_constructor(Eo *obj, Efl_Ui_Spin_Data *sd)
85 _label_write(obj, sd); 85 _label_write(obj, sd);
86 elm_widget_can_focus_set(obj, EINA_TRUE); 86 elm_widget_can_focus_set(obj, EINA_TRUE);
87 87
88 elm_layout_sizing_eval(obj);
89
90 return obj; 88 return obj;
91} 89}
92 90
@@ -100,7 +98,7 @@ EOLIAN static void
100_efl_ui_spin_efl_ui_format_apply_formatted_value(Eo *obj, Efl_Ui_Spin_Data *sd EINA_UNUSED) 98_efl_ui_spin_efl_ui_format_apply_formatted_value(Eo *obj, Efl_Ui_Spin_Data *sd EINA_UNUSED)
101{ 99{
102 _label_write(obj, sd); 100 _label_write(obj, sd);
103 elm_layout_sizing_eval(obj); 101 efl_canvas_group_change(obj);
104} 102}
105 103
106EOLIAN static void 104EOLIAN static void
diff --git a/src/lib/elementary/efl_ui_spin_button.c b/src/lib/elementary/efl_ui_spin_button.c
index 13b3c2ddf2..1c64acfc5a 100644
--- a/src/lib/elementary/efl_ui_spin_button.c
+++ b/src/lib/elementary/efl_ui_spin_button.c
@@ -634,7 +634,6 @@ _efl_ui_spin_button_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Spin_Button_Data *
634 _access_spinner_register(obj, EINA_TRUE); 634 _access_spinner_register(obj, EINA_TRUE);
635 635
636 _label_write(obj); 636 _label_write(obj);
637 elm_layout_sizing_eval(obj);
638 return EFL_UI_THEME_APPLY_ERROR_NONE; 637 return EFL_UI_THEME_APPLY_ERROR_NONE;
639} 638}
640 639
diff --git a/src/lib/elementary/efl_ui_tags.c b/src/lib/elementary/efl_ui_tags.c
index 97393c8d47..449681462c 100644
--- a/src/lib/elementary/efl_ui_tags.c
+++ b/src/lib/elementary/efl_ui_tags.c
@@ -522,8 +522,7 @@ _box_resize_cb(void *data,
522 { 522 {
523 EINA_LIST_FOREACH (sd->layouts, l, layout) 523 EINA_LIST_FOREACH (sd->layouts, l, layout)
524 { 524 {
525 elm_layout_sizing_eval(layout); 525 efl_canvas_group_calculate(layout);
526 evas_object_smart_calculate(layout);
527 526
528 min = efl_gfx_hint_size_combined_min_get(layout); 527 min = efl_gfx_hint_size_combined_min_get(layout);
529 528
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 419fd84434..b76c69e93b 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -891,7 +891,7 @@ _efl_ui_text_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Text_Data *sd)
891 891
892 } 892 }
893 893
894 elm_layout_sizing_eval(sd->scroller); 894 efl_canvas_group_calculate(sd->scroller);
895 min = efl_gfx_hint_size_min_get(sd->scroller); 895 min = efl_gfx_hint_size_min_get(sd->scroller);
896 if (sd->single_line) 896 if (sd->single_line)
897 { 897 {
@@ -2225,7 +2225,6 @@ _efl_ui_text_efl_object_finalize(Eo *obj,
2225 _create_text_cursors(obj, sd); 2225 _create_text_cursors(obj, sd);
2226 2226
2227 sd->calc_force = EINA_TRUE; 2227 sd->calc_force = EINA_TRUE;
2228 elm_layout_sizing_eval(obj);
2229 2228
2230 return obj; 2229 return obj;
2231 2230
@@ -2347,7 +2346,7 @@ _efl_ui_text_calc_force(Eo *obj, Efl_Ui_Text_Data *sd)
2347{ 2346{
2348 sd->calc_force = EINA_TRUE; 2347 sd->calc_force = EINA_TRUE;
2349 edje_object_calc_force(sd->entry_edje); 2348 edje_object_calc_force(sd->entry_edje);
2350 elm_layout_sizing_eval(obj); 2349 efl_canvas_group_calculate(obj);
2351} 2350}
2352 2351
2353static const char* 2352static const char*
@@ -2380,7 +2379,7 @@ _efl_ui_text_entry_insert(Eo *obj, Efl_Ui_Text_Data *sd, const char *entry)
2380 Efl_Text_Cursor_Cursor *cur_obj = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN); 2379 Efl_Text_Cursor_Cursor *cur_obj = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN);
2381 efl_text_cursor_text_insert(obj, cur_obj, entry); 2380 efl_text_cursor_text_insert(obj, cur_obj, entry);
2382 sd->text_changed = EINA_TRUE; 2381 sd->text_changed = EINA_TRUE;
2383 elm_layout_sizing_eval(obj); 2382 efl_canvas_group_change(obj);
2384} 2383}
2385 2384
2386EOLIAN static void 2385EOLIAN static void
@@ -2611,7 +2610,7 @@ _efl_ui_text_scrollable_set(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, Eina_Bool
2611 efl_del(sd->scroller); 2610 efl_del(sd->scroller);
2612 sd->scroller = NULL; 2611 sd->scroller = NULL;
2613 } 2612 }
2614 elm_layout_sizing_eval(obj); 2613 efl_canvas_group_change(obj);
2615} 2614}
2616 2615
2617EOLIAN static Eina_Bool 2616EOLIAN static Eina_Bool
@@ -3909,7 +3908,7 @@ _efl_ui_text_changed_cb(void *data, const Efl_Event *event)
3909 sd->cursor_update = EINA_TRUE; 3908 sd->cursor_update = EINA_TRUE;
3910 _update_guide_text(data, sd); 3909 _update_guide_text(data, sd);
3911 efl_event_callback_call(event->object, EFL_UI_TEXT_EVENT_CHANGED, NULL); 3910 efl_event_callback_call(event->object, EFL_UI_TEXT_EVENT_CHANGED, NULL);
3912 elm_layout_sizing_eval(data); 3911 efl_canvas_group_change(data);
3913 _decoration_defer(data); 3912 _decoration_defer(data);
3914} 3913}
3915 3914
@@ -3922,7 +3921,7 @@ _efl_ui_text_changed_user_cb(void *data, const Efl_Event *event)
3922 EFL_UI_TEXT_DATA_GET(obj, sd); 3921 EFL_UI_TEXT_DATA_GET(obj, sd);
3923 sd->text_changed = EINA_TRUE; 3922 sd->text_changed = EINA_TRUE;
3924 _update_guide_text(data, sd); 3923 _update_guide_text(data, sd);
3925 elm_layout_sizing_eval(obj); 3924 efl_canvas_group_change(obj);
3926 _decoration_defer_all(obj); 3925 _decoration_defer_all(obj);
3927} 3926}
3928 3927
diff --git a/src/lib/elementary/efl_ui_text_alert_popup.c b/src/lib/elementary/efl_ui_text_alert_popup.c
index 230328d21e..c6c01a03f4 100644
--- a/src/lib/elementary/efl_ui_text_alert_popup.c
+++ b/src/lib/elementary/efl_ui_text_alert_popup.c
@@ -113,7 +113,7 @@ _efl_ui_text_alert_popup_efl_ui_popup_popup_size_set(Eo *obj, Efl_Ui_Text_Alert_
113 113
114 efl_gfx_entity_size_set(obj, size); 114 efl_gfx_entity_size_set(obj, size);
115 115
116 elm_layout_sizing_eval(obj); 116 efl_canvas_group_change(obj);
117} 117}
118 118
119static void 119static void
@@ -153,7 +153,7 @@ _sizing_eval(Eo *obj, Efl_Ui_Text_Alert_Popup_Data *pd)
153EOLIAN static void 153EOLIAN static void
154_efl_ui_text_alert_popup_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Text_Alert_Popup_Data *pd) 154_efl_ui_text_alert_popup_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Text_Alert_Popup_Data *pd)
155{ 155{
156 /* When elm_layout_sizing_eval() is called, just flag is set instead of size 156 /* When efl_canvas_group_change() is called, just flag is set instead of size
157 * calculation. 157 * calculation.
158 * The actual size calculation is done here when the object is rendered to 158 * The actual size calculation is done here when the object is rendered to
159 * avoid duplicate size calculations. */ 159 * avoid duplicate size calculations. */
@@ -203,7 +203,7 @@ _efl_ui_text_alert_popup_text_set(Eo *obj, Efl_Ui_Text_Alert_Popup_Data *pd, con
203 efl_content_set(pd->scroller, pd->message); 203 efl_content_set(pd->scroller, pd->message);
204 } 204 }
205 elm_object_text_set(pd->message, label); 205 elm_object_text_set(pd->message, label);
206 elm_layout_sizing_eval(obj); 206 efl_canvas_group_change(obj);
207 } 207 }
208 else 208 else
209 efl_text_set(efl_part(efl_super(obj, MY_CLASS), part), label); 209 efl_text_set(efl_part(efl_super(obj, MY_CLASS), part), label);
@@ -260,7 +260,7 @@ _efl_ui_text_alert_popup_expandable_set(Eo *obj EINA_UNUSED, Efl_Ui_Text_Alert_P
260 260
261 pd->max_size = max_size; 261 pd->max_size = max_size;
262 262
263 elm_layout_sizing_eval(obj); 263 efl_canvas_group_change(obj);
264} 264}
265 265
266EOLIAN static Eo * 266EOLIAN static Eo *
diff --git a/src/lib/elementary/efl_ui_video.c b/src/lib/elementary/efl_ui_video.c
index c4281b9ea7..fe26077fd4 100644
--- a/src/lib/elementary/efl_ui_video.c
+++ b/src/lib/elementary/efl_ui_video.c
@@ -134,7 +134,7 @@ _on_size_hints_changed(void *data EINA_UNUSED,
134 Evas_Object *obj, 134 Evas_Object *obj,
135 void *event_info EINA_UNUSED) 135 void *event_info EINA_UNUSED)
136{ 136{
137 elm_layout_sizing_eval(obj); 137 efl_canvas_group_change(obj);
138} 138}
139 139
140static void 140static void
@@ -173,7 +173,7 @@ _on_playback_finished(void *data, const Efl_Event *event EINA_UNUSED)
173static void 173static void
174_on_aspect_ratio_updated(void *data, const Efl_Event *event EINA_UNUSED) 174_on_aspect_ratio_updated(void *data, const Efl_Event *event EINA_UNUSED)
175{ 175{
176 elm_layout_sizing_eval(data); 176 efl_canvas_group_change(data);
177} 177}
178 178
179static void 179static void