forked from enlightenment/efl
Ui text: instantiate canvas text obj before smart_add
This commit is contained in:
parent
51e4ec2d5c
commit
491b323d06
|
@ -3346,6 +3346,12 @@ _efl_ui_text_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Text_Data *priv)
|
||||||
|
|
||||||
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
|
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
|
||||||
|
|
||||||
|
/* XXX: needs to be before efl_canvas_group_add, since the latter will
|
||||||
|
* trigger a layout_sizing_eval call and requires the canvas text object to
|
||||||
|
* be instantiated. */
|
||||||
|
text_obj = eo_add(EFL_UI_INTERNAL_TEXT_INTERACTIVE_CLASS, obj);
|
||||||
|
eo_composite_attach(obj, text_obj);
|
||||||
|
|
||||||
efl_canvas_group_add(eo_super(obj, MY_CLASS));
|
efl_canvas_group_add(eo_super(obj, MY_CLASS));
|
||||||
elm_widget_sub_object_parent_add(obj);
|
elm_widget_sub_object_parent_add(obj);
|
||||||
|
|
||||||
|
@ -3369,9 +3375,6 @@ _efl_ui_text_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Text_Data *priv)
|
||||||
if (!elm_layout_theme_set(obj, "efl_ui_text", "base", elm_widget_style_get(obj)))
|
if (!elm_layout_theme_set(obj, "efl_ui_text", "base", elm_widget_style_get(obj)))
|
||||||
CRI("Failed to set layout!");
|
CRI("Failed to set layout!");
|
||||||
|
|
||||||
text_obj = eo_add(EFL_UI_INTERNAL_TEXT_INTERACTIVE_CLASS, obj);
|
|
||||||
eo_composite_attach(obj, text_obj);
|
|
||||||
|
|
||||||
edje_object_part_swallow(priv->entry_edje, "elm.text", text_obj);
|
edje_object_part_swallow(priv->entry_edje, "elm.text", text_obj);
|
||||||
evas_object_size_hint_weight_set
|
evas_object_size_hint_weight_set
|
||||||
(priv->entry_edje, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
(priv->entry_edje, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
||||||
|
|
Loading…
Reference in New Issue