summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSungtaek Hong <sth253.hong@samsung.com>2017-12-06 17:33:50 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-12-06 18:02:46 +0900
commit623cb5652f074064b5b39fb9a233dd72a1c41c17 (patch)
treec22de99cb026db2f9d1f93147526c1cc4b369559
parentd872bae95f9dc3c2d9176792f2a3eb301223d08f (diff)
elm_entry: remove warning during constructdevs/jpeg/eo_theme
Summary: elm_layout_theme_set calls theme_apply, which means some of the components might not be initialized. Test Plan: Run elementary_test->check no more ERR shown. Reviewers: jpeg, woohyun Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D5564
-rw-r--r--src/lib/elementary/elm_entry.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 3d7f23b149..b48c4a9020 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -3676,6 +3676,8 @@ _elm_entry_efl_canvas_group_group_add(Eo *obj, Elm_Entry_Data *priv)
3676{ 3676{
3677 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 3677 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
3678 3678
3679 if (!elm_widget_theme_klass_get(obj))
3680 elm_widget_theme_klass_set(obj, "entry");
3679 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 3681 efl_canvas_group_add(efl_super(obj, MY_CLASS));
3680 elm_widget_sub_object_parent_add(obj); 3682 elm_widget_sub_object_parent_add(obj);
3681 3683
@@ -3695,7 +3697,10 @@ _elm_entry_efl_canvas_group_group_add(Eo *obj, Elm_Entry_Data *priv)
3695 _dnd_pos_cb, NULL, 3697 _dnd_pos_cb, NULL,
3696 _dnd_drop_cb, NULL); 3698 _dnd_drop_cb, NULL);
3697 3699
3698 if (!elm_layout_theme_set(obj, "entry", "base", elm_widget_style_get(obj))) 3700 if (!elm_widget_theme_object_set(obj, wd->resize_obj,
3701 elm_widget_theme_klass_get(obj),
3702 elm_widget_theme_element_get(obj),
3703 elm_widget_theme_style_get(obj)))
3699 CRI("Failed to set layout!"); 3704 CRI("Failed to set layout!");
3700 3705
3701 priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj)); 3706 priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj));