enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

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
This commit is contained in:
Mike Blumenkrantz 2019-07-30 13:11:19 -04:00
parent 6883087ac7
commit adc510f9ee
24 changed files with 68 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/elementary/efl_ui_alert_popup.c
View File

@ -41,7 +41,7 @@ _efl_ui_alert_popup_text_set(Eo *obj, Efl_Ui_Alert_Popup_Data *pd, const char *p
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
edje_object_message_signal_process(wd->resize_obj);
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
}
}
else
@ -228,7 +228,7 @@ _efl_ui_alert_popup_button_set(Eo *obj, Efl_Ui_Alert_Popup_Data *pd, Efl_Ui_Aler
edje_object_message_signal_process(wd->resize_obj);
}
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
}
EOLIAN static Eo *

8
src/lib/elementary/efl_ui_anchor_popup.c
View File

@ -211,7 +211,8 @@ _anchor_del_cb(void *data, const Efl_Event *ev EINA_UNUSED)
pd->anchor = NULL;
//Add align calc only
Eina_Bool needs_size_calc = ppd->needs_size_calc;
elm_layout_sizing_eval(data);
efl_canvas_group_change(data);
efl_canvas_group_calculate(data);
ppd->needs_size_calc = needs_size_calc;
}
@ -247,7 +248,8 @@ _efl_ui_anchor_popup_anchor_set(Eo *obj, Efl_Ui_Anchor_Popup_Data *pd, Eo *ancho
//Add align/anchor calc only
Eina_Bool needs_size_calc = ppd->needs_size_calc;
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
efl_canvas_group_calculate(obj);
ppd->needs_size_calc = needs_size_calc;
}
@ -303,7 +305,7 @@ EOLIAN static void
_efl_ui_anchor_popup_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Anchor_Popup_Data *pd)
{
EFL_UI_POPUP_DATA_GET_OR_RETURN(obj, ppd);
/* When elm_layout_sizing_eval() is called, just flag is set instead of size
/* When efl_canvas_group_change() is called, just flag is set instead of size
* calculation.
* The actual size calculation is done here when the object is rendered to
* avoid duplicate size calculations. */

2
src/lib/elementary/efl_ui_button.c
View File

@ -422,7 +422,7 @@ _icon_signal_emit(Evas_Object *obj)
elm_layout_signal_emit(obj, buf, "elm");
edje_object_message_signal_process(elm_layout_edje_get(obj));
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
}
/* FIXME: replicated from elm_layout just because button's icon spot

4
src/lib/elementary/efl_ui_check.c
View File

@ -176,8 +176,6 @@ _efl_ui_check_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Check_Data *sd EINA_UNUS
edje_object_message_signal_process(wd->resize_obj);
elm_layout_sizing_eval(obj);
return int_ret;
}
@ -453,7 +451,7 @@ _icon_signal_emit(Evas_Object *obj)
elm_layout_signal_emit(obj, buf, "elm");
edje_object_message_signal_process(wd->resize_obj);
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
}
/* FIXME: replicated from elm_layout just because check's icon spot

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

@ -291,7 +291,7 @@ _field_list_arrange(Evas_Object *obj)
}
sd->freeze_sizing = freeze;
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
_field_list_display(obj);
}
@ -571,7 +571,6 @@ _efl_ui_clock_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Clock_Data *sd)
}
edje_object_message_signal_process(wd->resize_obj);
elm_layout_sizing_eval(obj);
return int_ret;
}
@ -903,7 +902,6 @@ _efl_ui_clock_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Clock_Data *priv)
elm_widget_can_focus_set(obj, EINA_TRUE);
priv->freeze_sizing = EINA_FALSE;
elm_layout_sizing_eval(obj);
// ACCESS
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
}
sd->freeze_sizing = EINA_FALSE;
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
if (!visible) return;
{

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

@ -45,7 +45,7 @@ _sizing_eval(Evas_Object *obj,
static void
_recalc(void *data, const Efl_Event *event EINA_UNUSED)
{
elm_layout_sizing_eval(data);
efl_canvas_group_calculate(data);
}
static void
@ -61,7 +61,7 @@ _on_recalc_done(void *data,
(wd->resize_obj, EFL_LAYOUT_EVENT_RECALC, _recalc, data);
sd->anim = EINA_FALSE;
elm_layout_sizing_eval(data);
efl_canvas_group_calculate(data);
}
static void
@ -158,8 +158,6 @@ _efl_ui_frame_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Frame_Data *_pd EINA_UN
elm_widget_theme_element_get(obj),
elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
CRI("Failed to set layout!");
elm_layout_sizing_eval(obj);
}
EOLIAN static Eo *

2
src/lib/elementary/efl_ui_image.c
View File

@ -1281,7 +1281,7 @@ _efl_ui_image_efl_layout_calc_calc_thaw(Eo *obj, Efl_Ui_Image_Data *sd)
if (sd->edje)
{
int ret = edje_object_thaw(sd->img);
elm_layout_sizing_eval(obj);
efl_canvas_group_calculate(obj);
return ret;
}
return 0;

4
src/lib/elementary/efl_ui_item.c
View File

@ -28,7 +28,7 @@ _efl_ui_item_part_text_efl_text_text_set(Eo *obj, void *pd EINA_UNUSED, const ch
Elm_Part_Data *wd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
efl_text_set(efl_part(efl_super(wd->obj, MY_CLASS), wd->part), text);
elm_layout_sizing_eval(wd->obj);
efl_canvas_group_change(wd->obj);
}
EOLIAN static const char*
@ -44,7 +44,7 @@ _efl_ui_item_part_text_efl_text_markup_markup_set(Eo *obj, void *pd EINA_UNUSED,
Elm_Part_Data *wd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
efl_text_markup_set(efl_part(efl_super(wd->obj, MY_CLASS), wd->part), markup);
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
}
EOLIAN static const char*

29
src/lib/elementary/efl_ui_layout.c
View File

@ -146,7 +146,7 @@ _on_sub_object_size_hint_change(void *data,
{
if (!efl_alive_get(data)) return;
ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
elm_layout_sizing_eval(data);
efl_canvas_group_change(data);
}
static void
@ -437,7 +437,7 @@ _visuals_refresh(Evas_Object *obj,
_efl_ui_layout_highlight_in_theme(obj);
_flush_mirrored_state(obj);
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
return EINA_TRUE;
}
@ -577,7 +577,7 @@ _efl_ui_layout_base_efl_ui_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Layout_D
// No need to resize object during destruction
if (wd->resize_obj && efl_alive_get(obj))
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
return EINA_TRUE;
}
@ -733,7 +733,8 @@ _on_size_evaluate_signal(void *data,
const char *emission EINA_UNUSED,
const char *source EINA_UNUSED)
{
elm_layout_sizing_eval(data);
efl_canvas_group_change(data);
efl_canvas_group_calculate(data);
}
EOLIAN static void
@ -1062,7 +1063,7 @@ _efl_ui_layout_content_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Ev
_icon_signal_emit(sd, sub_d, EINA_TRUE);
}
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
end:
return EINA_TRUE;
@ -1262,7 +1263,7 @@ _efl_ui_layout_text_generic_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *par
edje_object_part_text_escaped_set
(wd->resize_obj, part, NULL);
sd->subs = eina_list_remove_list(sd->subs, l);
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
return EINA_TRUE;
}
else
@ -1298,7 +1299,7 @@ _efl_ui_layout_text_generic_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *par
_text_signal_emit(sd, sub_d, EINA_TRUE);
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
if (_elm_config->access_mode == ELM_ACCESS_MODE_ON &&
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
sub_d->type = BOX_APPEND;
_layout_box_subobj_init(sd, sub_d, part, child);
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
return EINA_TRUE;
}
@ -1434,7 +1435,7 @@ _efl_ui_layout_box_prepend(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Ev
sub_d->type = BOX_PREPEND;
_layout_box_subobj_init(sd, sub_d, part, child);
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
return EINA_TRUE;
}
@ -1476,7 +1477,7 @@ _efl_ui_layout_box_insert_before(Eo *obj, Efl_Ui_Layout_Data *sd, const char *pa
evas_object_event_callback_add
((Evas_Object *)reference, EVAS_CALLBACK_DEL, _box_reference_del, sub_d);
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
return EINA_TRUE;
}
@ -1514,7 +1515,7 @@ _efl_ui_layout_box_insert_at(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part,
sub_d->p.box.pos = pos;
_layout_box_subobj_init(sd, sub_d, part, child);
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
return EINA_TRUE;
}
@ -1612,7 +1613,7 @@ _efl_ui_layout_table_pack(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Eva
sd->subs = eina_list_append(sd->subs, sub_d);
efl_parent_set(child, obj);
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
return EINA_TRUE;
}
@ -1733,7 +1734,7 @@ elm_layout_sizing_restricted_eval(Eo *obj, Eina_Bool w, Eina_Bool h)
sd->restricted_calc_w = !!w;
sd->restricted_calc_h = !!h;
evas_object_smart_changed(obj);
efl_canvas_group_change(obj);
}
EOLIAN static int
@ -1757,7 +1758,7 @@ _efl_ui_layout_base_efl_layout_calc_calc_thaw(Eo *obj, Efl_Ui_Layout_Data *sd)
edje_object_thaw(wd->resize_obj);
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
return 0;
}

2
src/lib/elementary/efl_ui_list_view.c
View File

@ -626,8 +626,6 @@ _efl_ui_list_view_efl_canvas_group_group_add(Eo *obj, Efl_Ui_List_View_Data *pd)
_efl_ui_list_view_bar_hide_cb, obj);
_efl_ui_list_view_edje_object_attach(obj);
elm_layout_sizing_eval(obj);
}
EOLIAN static void

12
src/lib/elementary/efl_ui_panel.c
View File

@ -239,9 +239,6 @@ _efl_ui_panel_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Panel_Data *sd)
efl_content_set(efl_part(efl_super(obj, MY_CLASS), "efl.swallow.event"), sd->event);
}
if (efl_finalized_get(obj))
elm_layout_sizing_eval(obj);
return int_ret;
}
@ -740,8 +737,7 @@ _efl_ui_panel_efl_content_content_set(Eo *obj, Efl_Ui_Panel_Data *sd, Efl_Gfx_En
elm_widget_sub_object_add(sd->scr_ly, sd->content);
}
efl_event_callback_call(obj, EFL_CONTENT_EVENT_CONTENT_CHANGED, content);
if (efl_alive_get(obj))
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
return EINA_TRUE;
}
@ -790,8 +786,7 @@ _scrollable_layout_resize(Eo *obj, Efl_Ui_Panel_Data *sd, Evas_Coord w, Evas_Coo
evas_object_size_hint_min_set(sd->scr_event, w, h);
break;
}
if (efl_finalized_get(obj))
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
}
EOLIAN static void
@ -950,8 +945,7 @@ _efl_ui_panel_orient_set(Eo *obj, Efl_Ui_Panel_Data *sd, Efl_Ui_Panel_Orient ori
else
_orient_set_do(obj);
if (efl_finalized_get(obj))
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
}
EOLIAN static Efl_Ui_Panel_Orient

8
src/lib/elementary/efl_ui_panes.c
View File

@ -150,8 +150,6 @@ _efl_ui_panes_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Panes_Data *sd)
elm_layout_signal_emit(obj, "efl,panes,fixed", "efl");
}
elm_layout_sizing_eval(obj);
elm_panes_content_left_size_set(obj, size);
return int_ret;
@ -486,8 +484,6 @@ _efl_ui_panes_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Panes_Data *_pd EINA_UN
}
}
elm_widget_sub_object_add(obj, sd->event);
elm_layout_sizing_eval(obj);
}
EOLIAN static Eo *
@ -628,13 +624,13 @@ _efl_ui_panes_part_hint_min_allow_set(Eo *obj, void *_pd EINA_UNUSED, Eina_Bool
{
if (sd->first_hint_min_allow == allow) return;
sd->first_hint_min_allow = allow;
elm_layout_sizing_eval(pd->obj);
efl_canvas_group_change(pd->obj);
}
else if (!strcmp(pd->part, "second"))
{
if (sd->second_hint_min_allow == allow) return;
sd->second_hint_min_allow = allow;
elm_layout_sizing_eval(pd->obj);
efl_canvas_group_change(pd->obj);
}
}

10
src/lib/elementary/efl_ui_popup.c
View File

@ -79,7 +79,7 @@ _efl_ui_popup_efl_gfx_entity_size_set(Eo *obj, Efl_Ui_Popup_Data *pd EINA_UNUSED
{
efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), size);
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
}
static void
@ -91,7 +91,8 @@ _parent_geom_cb(void *data, const Efl_Event *ev EINA_UNUSED)
//Add align calc only
Eina_Bool needs_size_calc = pd->needs_size_calc;
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
efl_canvas_group_calculate(obj);
pd->needs_size_calc = needs_size_calc;
}
@ -133,7 +134,8 @@ _efl_ui_popup_align_set(Eo *obj EINA_UNUSED, Efl_Ui_Popup_Data *pd, Efl_Ui_Popup
//Add align calc only
Eina_Bool needs_size_calc = pd->needs_size_calc;
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
efl_canvas_group_calculate(obj);
pd->needs_size_calc = needs_size_calc;
}
@ -302,7 +304,7 @@ _efl_ui_popup_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Popup_Data *pd)
EOLIAN static void
_efl_ui_popup_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Popup_Data *pd)
{
/* When elm_layout_sizing_eval() is called, just flag is set instead of size
/* When efl_canvas_group_change() is called, just flag is set instead of size
* calculation.
* The actual size calculation is done here when the object is rendered to
* avoid duplicate size calculations. */

10
src/lib/elementary/efl_ui_progressbar.c
View File

@ -296,8 +296,6 @@ _efl_ui_progressbar_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Progressbar_Data *
edje_object_message_signal_process(wd->resize_obj);
elm_layout_sizing_eval(obj);
return int_ret;
}
@ -376,8 +374,6 @@ _efl_ui_progressbar_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Progressbar_Data
_units_set(obj);
_val_set(obj);
elm_layout_sizing_eval(obj);
if (_elm_config->access_mode == ELM_ACCESS_MODE_ON)
elm_widget_can_focus_set(obj, EINA_TRUE);
@ -469,7 +465,7 @@ _progressbar_span_size_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, Evas_Coord size
(sd->spacer, 1, (double)sd->size * efl_gfx_entity_scale_get(obj) *
elm_config_scale_get());
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
}
static void
@ -761,7 +757,7 @@ _efl_ui_progressbar_show_progress_label_set(Eo *obj EINA_UNUSED, Efl_Ui_Progress
elm_layout_signal_emit(obj, signal_name, ns);
edje_object_message_signal_process(wd->resize_obj);
_units_set(obj);
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
}
EOLIAN static Eina_Bool
@ -828,7 +824,7 @@ _icon_signal_emit(Evas_Object *obj)
elm_layout_signal_emit(obj, buf, "elm");
edje_object_message_signal_process(elm_layout_edje_get(obj));
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
}
/* FIXME: replicated from elm_layout just because progressbar's icon spot

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

@ -176,8 +176,6 @@ _efl_ui_radio_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Radio_Data *sd EINA_UNUS
edje_object_message_signal_process(wd->resize_obj);
elm_layout_sizing_eval(obj);
return int_ret;
}
@ -233,8 +231,6 @@ _efl_ui_radio_efl_object_constructor(Eo *obj, Efl_Ui_Radio_Data *pd)
pd->group->radios = eina_list_append(pd->group->radios, obj);
}
elm_layout_sizing_eval(obj);
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_RADIO_BUTTON);
_elm_access_text_set
(_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("Radio"));
@ -357,7 +353,7 @@ _icon_signal_emit(Evas_Object *obj)
elm_layout_signal_emit(obj, buf, "elm");
edje_object_message_signal_process(edje);
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
}
EOLIAN static Eina_Error

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

@ -133,7 +133,7 @@ _sizing_eval(Eo *obj, Efl_Ui_Scroll_Alert_Popup_Data *pd)
EOLIAN static void
_efl_ui_scroll_alert_popup_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Scroll_Alert_Popup_Data *pd)
{
/* When elm_layout_sizing_eval() is called, just flag is set instead of size
/* When efl_canvas_group_change() is called, just flag is set instead of size
* calculation.
* The actual size calculation is done here when the object is rendered to
* avoid duplicate size calculations. */
@ -236,7 +236,7 @@ _efl_ui_scroll_alert_popup_expandable_set(Eo *obj EINA_UNUSED, Efl_Ui_Scroll_Ale
pd->max_size = max_size;
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
}
static Eina_Size2D
@ -252,7 +252,7 @@ _efl_ui_scroll_alert_popup_efl_ui_popup_popup_size_set(Eo *obj, Efl_Ui_Scroll_Al
efl_gfx_entity_size_set(obj, size);
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
}
EOLIAN static Eo *

4
src/lib/elementary/efl_ui_scroll_util.c
View File

@ -214,14 +214,14 @@ static void
_scroll_connector_resized_cb(void *data, const Efl_Event *ev EINA_UNUSED)
{
Scroll_Connector_Context *ctx = data;
elm_layout_sizing_eval(ctx->obj);
efl_canvas_group_change(ctx->obj);
}
static void
_scroll_connector_size_hint_changed_cb(void *data, const Efl_Event *ev EINA_UNUSED)
{
Scroll_Connector_Context *ctx = data;
elm_layout_sizing_eval(ctx->obj);
efl_canvas_group_change(ctx->obj);
}
void

8
src/lib/elementary/efl_ui_scroller.c
View File

@ -184,7 +184,7 @@ _efl_ui_scroller_efl_content_content_set(Eo *obj,
efl_content_set(sd->pan_obj, content);
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
return EINA_TRUE;
}
@ -214,7 +214,7 @@ _efl_ui_scroller_efl_content_content_unset(Eo *obj EINA_UNUSED, Efl_Ui_Scroller_
static void
_efl_ui_scroller_pan_resized_cb(void *data, const Efl_Event *ev EINA_UNUSED)
{
elm_layout_sizing_eval(data);
efl_canvas_group_change(data);
}
static void
@ -351,8 +351,6 @@ _efl_ui_scroller_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Scroller_Data *sd)
efl_ui_mirrored_set(sd->smanager, efl_ui_mirrored_get(obj));
elm_layout_sizing_eval(obj);
return int_ret;
}
@ -367,7 +365,7 @@ _efl_ui_scroller_efl_ui_scrollable_interactive_match_content_set(Eo *obj EINA_UN
efl_ui_scrollable_match_content_set(sd->smanager, match_content_w, match_content_h);
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
}
EOLIAN static Eina_Bool

4
src/lib/elementary/efl_ui_spin.c
View File

@ -85,8 +85,6 @@ _efl_ui_spin_efl_object_constructor(Eo *obj, Efl_Ui_Spin_Data *sd)
_label_write(obj, sd);
elm_widget_can_focus_set(obj, EINA_TRUE);
elm_layout_sizing_eval(obj);
return obj;
}
@ -100,7 +98,7 @@ EOLIAN static void
_efl_ui_spin_efl_ui_format_apply_formatted_value(Eo *obj, Efl_Ui_Spin_Data *sd EINA_UNUSED)
{
_label_write(obj, sd);
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
}
EOLIAN static void

1
src/lib/elementary/efl_ui_spin_button.c
View File

@ -634,7 +634,6 @@ _efl_ui_spin_button_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Spin_Button_Data *
_access_spinner_register(obj, EINA_TRUE);
_label_write(obj);
elm_layout_sizing_eval(obj);
return EFL_UI_THEME_APPLY_ERROR_NONE;
}

3
src/lib/elementary/efl_ui_tags.c
View File

@ -522,8 +522,7 @@ _box_resize_cb(void *data,
{
EINA_LIST_FOREACH (sd->layouts, l, layout)
{
elm_layout_sizing_eval(layout);
evas_object_smart_calculate(layout);
efl_canvas_group_calculate(layout);
min = efl_gfx_hint_size_combined_min_get(layout);

13
src/lib/elementary/efl_ui_text.c
View File

@ -891,7 +891,7 @@ _efl_ui_text_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Text_Data *sd)
}
elm_layout_sizing_eval(sd->scroller);
efl_canvas_group_calculate(sd->scroller);
min = efl_gfx_hint_size_min_get(sd->scroller);
if (sd->single_line)
{
@ -2225,7 +2225,6 @@ _efl_ui_text_efl_object_finalize(Eo *obj,
_create_text_cursors(obj, sd);
sd->calc_force = EINA_TRUE;
elm_layout_sizing_eval(obj);
return obj;
@ -2347,7 +2346,7 @@ _efl_ui_text_calc_force(Eo *obj, Efl_Ui_Text_Data *sd)
{
sd->calc_force = EINA_TRUE;
edje_object_calc_force(sd->entry_edje);
elm_layout_sizing_eval(obj);
efl_canvas_group_calculate(obj);
}
static const char*
@ -2380,7 +2379,7 @@ _efl_ui_text_entry_insert(Eo *obj, Efl_Ui_Text_Data *sd, const char *entry)
Efl_Text_Cursor_Cursor *cur_obj = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN);
efl_text_cursor_text_insert(obj, cur_obj, entry);
sd->text_changed = EINA_TRUE;
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
}
EOLIAN static void
@ -2611,7 +2610,7 @@ _efl_ui_text_scrollable_set(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, Eina_Bool
efl_del(sd->scroller);
sd->scroller = NULL;
}
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
}
EOLIAN static Eina_Bool
@ -3909,7 +3908,7 @@ _efl_ui_text_changed_cb(void *data, const Efl_Event *event)
sd->cursor_update = EINA_TRUE;
_update_guide_text(data, sd);
efl_event_callback_call(event->object, EFL_UI_TEXT_EVENT_CHANGED, NULL);
elm_layout_sizing_eval(data);
efl_canvas_group_change(data);
_decoration_defer(data);
}
@ -3922,7 +3921,7 @@ _efl_ui_text_changed_user_cb(void *data, const Efl_Event *event)
EFL_UI_TEXT_DATA_GET(obj, sd);
sd->text_changed = EINA_TRUE;
_update_guide_text(data, sd);
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
_decoration_defer_all(obj);
}

8
src/lib/elementary/efl_ui_text_alert_popup.c
View File

@ -113,7 +113,7 @@ _efl_ui_text_alert_popup_efl_ui_popup_popup_size_set(Eo *obj, Efl_Ui_Text_Alert_
efl_gfx_entity_size_set(obj, size);
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
}
static void
@ -153,7 +153,7 @@ _sizing_eval(Eo *obj, Efl_Ui_Text_Alert_Popup_Data *pd)
EOLIAN static void
_efl_ui_text_alert_popup_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Text_Alert_Popup_Data *pd)
{
/* When elm_layout_sizing_eval() is called, just flag is set instead of size
/* When efl_canvas_group_change() is called, just flag is set instead of size
* calculation.
* The actual size calculation is done here when the object is rendered to
* 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
efl_content_set(pd->scroller, pd->message);
}
elm_object_text_set(pd->message, label);
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
}
else
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
pd->max_size = max_size;
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
}
EOLIAN static Eo *

4
src/lib/elementary/efl_ui_video.c
View File

@ -134,7 +134,7 @@ _on_size_hints_changed(void *data EINA_UNUSED,
Evas_Object *obj,
void *event_info EINA_UNUSED)
{
elm_layout_sizing_eval(obj);
efl_canvas_group_change(obj);
}
static void
@ -173,7 +173,7 @@ _on_playback_finished(void *data, const Efl_Event *event EINA_UNUSED)
static void
_on_aspect_ratio_updated(void *data, const Efl_Event *event EINA_UNUSED)
{
elm_layout_sizing_eval(data);
efl_canvas_group_change(data);
}
static void