summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSungTaek Hong <sth253.hong@samsung.com>2016-02-18 13:31:26 -0800
committerCedric BAIL <cedric@osg.samsung.com>2016-02-18 13:31:28 -0800
commit512fe5fd3d1561e2d7b7c4517ceee24da3744ddc (patch)
tree96eb6bef8a7d4313a482b0660f892e852184fb0f
parent02527846a5965d416379f8b7b246bf914d17b213 (diff)
edje_external: check icon param after other param is set in entry
Summary: - icon param add an elm_icon and content set to icon part. - entry's style is changing as other params are set and icon part may not exist in certain condition(default has no icon part) - checking icon param later than other params will set icon part after the style is changed. Reviewers: cedric, woohyun, jpeg, herdsman, tasn Reviewed By: tasn Subscribers: conr2d Differential Revision: https://phab.enlightenment.org/D3693 Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
-rw-r--r--src/edje_externals/elm_entry.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/edje_externals/elm_entry.c b/src/edje_externals/elm_entry.c
index 973a8bb12..51f3c0811 100644
--- a/src/edje_externals/elm_entry.c
+++ b/src/edje_externals/elm_entry.c
@@ -57,8 +57,6 @@ external_entry_state_set(void *data EINA_UNUSED, Evas_Object *obj,
57 57
58 if (p->label) 58 if (p->label)
59 elm_object_text_set(obj, p->label); 59 elm_object_text_set(obj, p->label);
60 if (p->icon)
61 elm_object_part_content_set(obj, "icon", p->icon);
62 if (p->entry) 60 if (p->entry)
63 elm_object_text_set(obj, p->entry); 61 elm_object_text_set(obj, p->entry);
64 if (p->scrollable_exists) 62 if (p->scrollable_exists)
@@ -84,6 +82,8 @@ external_entry_state_set(void *data EINA_UNUSED, Evas_Object *obj,
84 line_wrap = _entry_line_wrap_choices_setting_get(p->line_wrap); 82 line_wrap = _entry_line_wrap_choices_setting_get(p->line_wrap);
85 elm_entry_line_wrap_set(obj, line_wrap); 83 elm_entry_line_wrap_set(obj, line_wrap);
86 } 84 }
85 if (p->icon)
86 elm_object_part_content_set(obj, "icon", p->icon);
87} 87}
88 88
89static Eina_Bool 89static Eina_Bool