forked from enlightenment/efl
layout: Use only legacy "elm_layout_sizing_eval"
This removes all uses of elm_obj_layout_sizing_eval. Ref T5315
This commit is contained in:
parent
fb941c457c
commit
ad7e16bcf4
|
@ -114,7 +114,7 @@ _icon_signal_emit(Evas_Object *obj)
|
||||||
|
|
||||||
elm_layout_signal_emit(obj, buf, "elm");
|
elm_layout_signal_emit(obj, buf, "elm");
|
||||||
edje_object_message_signal_process(elm_layout_edje_get(obj));
|
edje_object_message_signal_process(elm_layout_edje_get(obj));
|
||||||
elm_obj_layout_sizing_eval(obj);
|
elm_layout_sizing_eval(obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* FIXME: replicated from elm_layout just because button's icon spot
|
/* FIXME: replicated from elm_layout just because button's icon spot
|
||||||
|
|
|
@ -126,7 +126,7 @@ _efl_ui_check_elm_widget_sub_object_del(Eo *obj, Efl_Ui_Check_Data *_pd EINA_UNU
|
||||||
|
|
||||||
_icon_signal_emit(obj);
|
_icon_signal_emit(obj);
|
||||||
|
|
||||||
elm_obj_layout_sizing_eval(obj);
|
elm_layout_sizing_eval(obj);
|
||||||
|
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
}
|
}
|
||||||
|
@ -188,7 +188,7 @@ _efl_ui_check_elm_widget_theme_apply(Eo *obj, Efl_Ui_Check_Data *sd EINA_UNUSED)
|
||||||
* we can changed the theme API */
|
* we can changed the theme API */
|
||||||
_icon_signal_emit(obj);
|
_icon_signal_emit(obj);
|
||||||
|
|
||||||
elm_obj_layout_sizing_eval(obj);
|
elm_layout_sizing_eval(obj);
|
||||||
|
|
||||||
return int_ret;
|
return int_ret;
|
||||||
}
|
}
|
||||||
|
|
|
@ -57,7 +57,7 @@ _state_active(Evas_Object *obj, Efl_Ui_Nstate_Data *sd)
|
||||||
sprintf(buf, "elm,state,changed,%d", sd->state);
|
sprintf(buf, "elm,state,changed,%d", sd->state);
|
||||||
elm_layout_signal_emit(obj, buf, "elm");
|
elm_layout_signal_emit(obj, buf, "elm");
|
||||||
edje_object_message_signal_process(elm_layout_edje_get(obj));
|
edje_object_message_signal_process(elm_layout_edje_get(obj));
|
||||||
elm_obj_layout_sizing_eval(obj);
|
elm_layout_sizing_eval(obj);
|
||||||
efl_event_callback_legacy_call(obj, EFL_UI_NSTATE_EVENT_STATE_CHANGED, NULL);
|
efl_event_callback_legacy_call(obj, EFL_UI_NSTATE_EVENT_STATE_CHANGED, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -182,7 +182,7 @@ _efl_ui_radio_elm_widget_theme_apply(Eo *obj, Efl_Ui_Radio_Data *sd)
|
||||||
* whenever we can changed the theme API */
|
* whenever we can changed the theme API */
|
||||||
_icon_signal_emit(obj);
|
_icon_signal_emit(obj);
|
||||||
|
|
||||||
elm_obj_layout_sizing_eval(obj);
|
elm_layout_sizing_eval(obj);
|
||||||
|
|
||||||
return int_ret;
|
return int_ret;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2013,7 +2013,7 @@ _elm_fileselector_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Data *pri
|
||||||
priv->files_view = _files_list_add(obj);
|
priv->files_view = _files_list_add(obj);
|
||||||
elm_object_part_content_set(obj, "elm.swallow.files", priv->files_view);
|
elm_object_part_content_set(obj, "elm.swallow.files", priv->files_view);
|
||||||
|
|
||||||
elm_obj_layout_sizing_eval(obj);
|
elm_layout_sizing_eval(obj);
|
||||||
|
|
||||||
_focus_chain_update(obj, priv);
|
_focus_chain_update(obj, priv);
|
||||||
}
|
}
|
||||||
|
|
|
@ -440,7 +440,7 @@ _item_content_realize(Elm_Gen_Item *it,
|
||||||
|
|
||||||
// FIXME : Layout need sizing eval before group calculate
|
// FIXME : Layout need sizing eval before group calculate
|
||||||
if (efl_class_get(content) == ELM_LAYOUT_CLASS)
|
if (efl_class_get(content) == ELM_LAYOUT_CLASS)
|
||||||
elm_obj_layout_sizing_eval(content);
|
elm_layout_sizing_eval(content);
|
||||||
|
|
||||||
_widget_calculate_recursive(content);
|
_widget_calculate_recursive(content);
|
||||||
}
|
}
|
||||||
|
|
|
@ -347,7 +347,7 @@ _elm_label_text_set(Eo *obj, Elm_Label_Data *sd, const char *part, const char *l
|
||||||
if (int_ret)
|
if (int_ret)
|
||||||
{
|
{
|
||||||
sd->lastw = -1;
|
sd->lastw = -1;
|
||||||
elm_obj_layout_sizing_eval(obj);
|
elm_layout_sizing_eval(obj);
|
||||||
_label_slide_change(obj);
|
_label_slide_change(obj);
|
||||||
}
|
}
|
||||||
return int_ret;
|
return int_ret;
|
||||||
|
|
|
@ -125,7 +125,7 @@ _on_sub_object_size_hint_change(void *data,
|
||||||
void *event_info EINA_UNUSED)
|
void *event_info EINA_UNUSED)
|
||||||
{
|
{
|
||||||
ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
|
ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
|
||||||
elm_obj_layout_sizing_eval(data);
|
elm_layout_sizing_eval(data);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -329,7 +329,7 @@ _visuals_refresh(Evas_Object *obj,
|
||||||
|
|
||||||
ret = elm_obj_widget_disable(obj);
|
ret = elm_obj_widget_disable(obj);
|
||||||
|
|
||||||
elm_obj_layout_sizing_eval(obj);
|
elm_layout_sizing_eval(obj);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -538,7 +538,7 @@ _elm_layout_elm_widget_sub_object_del(Eo *obj, Elm_Layout_Smart_Data *sd, Evas_O
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
elm_obj_layout_sizing_eval(obj);
|
elm_layout_sizing_eval(obj);
|
||||||
|
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
}
|
}
|
||||||
|
@ -714,7 +714,7 @@ _on_size_evaluate_signal(void *data,
|
||||||
const char *emission EINA_UNUSED,
|
const char *emission EINA_UNUSED,
|
||||||
const char *source EINA_UNUSED)
|
const char *source EINA_UNUSED)
|
||||||
{
|
{
|
||||||
elm_obj_layout_sizing_eval(data);
|
elm_layout_sizing_eval(data);
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
|
@ -735,7 +735,7 @@ _elm_layout_efl_canvas_group_group_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_
|
||||||
edje_object_signal_callback_add
|
edje_object_signal_callback_add
|
||||||
(edje, "size,eval", "elm", _on_size_evaluate_signal, obj);
|
(edje, "size,eval", "elm", _on_size_evaluate_signal, obj);
|
||||||
|
|
||||||
elm_obj_layout_sizing_eval(obj);
|
elm_layout_sizing_eval(obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
|
@ -1050,7 +1050,7 @@ _elm_layout_content_set(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Ev
|
||||||
_icon_signal_emit(sd, sub_d, EINA_TRUE);
|
_icon_signal_emit(sd, sub_d, EINA_TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
elm_obj_layout_sizing_eval(obj);
|
elm_layout_sizing_eval(obj);
|
||||||
|
|
||||||
end:
|
end:
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
|
@ -1294,7 +1294,7 @@ _elm_layout_text_set(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, const
|
||||||
|
|
||||||
_text_signal_emit(sd, sub_d, !!text);
|
_text_signal_emit(sd, sub_d, !!text);
|
||||||
|
|
||||||
elm_obj_layout_sizing_eval(obj);
|
elm_layout_sizing_eval(obj);
|
||||||
|
|
||||||
if (_elm_config->access_mode == ELM_ACCESS_MODE_ON &&
|
if (_elm_config->access_mode == ELM_ACCESS_MODE_ON &&
|
||||||
sd->can_access && !(sub_d->obj))
|
sd->can_access && !(sub_d->obj))
|
||||||
|
@ -1370,7 +1370,7 @@ _elm_layout_box_append(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Eva
|
||||||
sub_d->type = BOX_APPEND;
|
sub_d->type = BOX_APPEND;
|
||||||
_layout_box_subobj_init(sd, sub_d, part, child);
|
_layout_box_subobj_init(sd, sub_d, part, child);
|
||||||
|
|
||||||
elm_obj_layout_sizing_eval(obj);
|
elm_layout_sizing_eval(obj);
|
||||||
|
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
}
|
}
|
||||||
|
@ -1407,7 +1407,7 @@ _elm_layout_box_prepend(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Ev
|
||||||
sub_d->type = BOX_PREPEND;
|
sub_d->type = BOX_PREPEND;
|
||||||
_layout_box_subobj_init(sd, sub_d, part, child);
|
_layout_box_subobj_init(sd, sub_d, part, child);
|
||||||
|
|
||||||
elm_obj_layout_sizing_eval(obj);
|
elm_layout_sizing_eval(obj);
|
||||||
|
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
}
|
}
|
||||||
|
@ -1449,7 +1449,7 @@ _elm_layout_box_insert_before(Eo *obj, Elm_Layout_Smart_Data *sd, const char *pa
|
||||||
evas_object_event_callback_add
|
evas_object_event_callback_add
|
||||||
((Evas_Object *)reference, EVAS_CALLBACK_DEL, _box_reference_del, sub_d);
|
((Evas_Object *)reference, EVAS_CALLBACK_DEL, _box_reference_del, sub_d);
|
||||||
|
|
||||||
elm_obj_layout_sizing_eval(obj);
|
elm_layout_sizing_eval(obj);
|
||||||
|
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
}
|
}
|
||||||
|
@ -1487,7 +1487,7 @@ _elm_layout_box_insert_at(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part,
|
||||||
sub_d->p.box.pos = pos;
|
sub_d->p.box.pos = pos;
|
||||||
_layout_box_subobj_init(sd, sub_d, part, child);
|
_layout_box_subobj_init(sd, sub_d, part, child);
|
||||||
|
|
||||||
elm_obj_layout_sizing_eval(obj);
|
elm_layout_sizing_eval(obj);
|
||||||
|
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
}
|
}
|
||||||
|
@ -1585,7 +1585,7 @@ _elm_layout_table_pack(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Eva
|
||||||
sd->subs = eina_list_append(sd->subs, sub_d);
|
sd->subs = eina_list_append(sd->subs, sub_d);
|
||||||
efl_parent_set(child, obj);
|
efl_parent_set(child, obj);
|
||||||
|
|
||||||
elm_obj_layout_sizing_eval(obj);
|
elm_layout_sizing_eval(obj);
|
||||||
|
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
}
|
}
|
||||||
|
@ -1702,7 +1702,7 @@ _elm_layout_efl_canvas_layout_calc_calc_thaw(Eo *obj, Elm_Layout_Smart_Data *sd)
|
||||||
|
|
||||||
edje_object_thaw(wd->resize_obj);
|
edje_object_thaw(wd->resize_obj);
|
||||||
|
|
||||||
elm_obj_layout_sizing_eval(obj);
|
elm_layout_sizing_eval(obj);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue