From 0b8fe93c518b52d5e6894541eeea7f06904dc7b2 Mon Sep 17 00:00:00 2001 From: SungTaek Hong Date: Thu, 18 Feb 2016 13:31:26 -0800 Subject: [PATCH] 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 --- legacy/elementary/src/edje_externals/elm_entry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/legacy/elementary/src/edje_externals/elm_entry.c b/legacy/elementary/src/edje_externals/elm_entry.c index 973a8bb122..51f3c0811d 100644 --- a/legacy/elementary/src/edje_externals/elm_entry.c +++ b/legacy/elementary/src/edje_externals/elm_entry.c @@ -57,8 +57,6 @@ external_entry_state_set(void *data EINA_UNUSED, Evas_Object *obj, if (p->label) elm_object_text_set(obj, p->label); - if (p->icon) - elm_object_part_content_set(obj, "icon", p->icon); if (p->entry) elm_object_text_set(obj, p->entry); if (p->scrollable_exists) @@ -84,6 +82,8 @@ external_entry_state_set(void *data EINA_UNUSED, Evas_Object *obj, line_wrap = _entry_line_wrap_choices_setting_get(p->line_wrap); elm_entry_line_wrap_set(obj, line_wrap); } + if (p->icon) + elm_object_part_content_set(obj, "icon", p->icon); } static Eina_Bool