cedric pushed a commit to branch master.


commit 512fe5fd3d1561e2d7b7c4517ceee24da3744ddc
Author: SungTaek Hong <sth253.h...@samsung.com>
Date:   Thu Feb 18 13:31:26 2016 -0800

    edje_external: check icon param after other param is set in entry
    - 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 <ced...@osg.samsung.com>
 src/edje_externals/elm_entry.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/edje_externals/elm_entry.c b/src/edje_externals/elm_entry.c
index 973a8bb..51f3c08 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 
    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 
         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


Reply via email to