[entry] Fix non-scrollable entry did not comply focus_highlight data.

Change-Id: Ie0ae78ef478f95c5752a19f2385cae4cc3e0e7d2

diff --git a/ChangeLog b/ChangeLog
index 2d727ac..2911c47 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1086,3 +1086,7 @@
 2013-06-19  Jaehwan Kim
 
         * Fix elm_scroller_page_show bug. It have to save the wanted values to show the wanted page.
+
+2013-06-20  Youngbok Shin
+
+        * Fix non-scrollable entry did not comply focus_highlight data.

diff --git a/NEWS b/NEWS
index 092b4e7..1f3e9b1 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -134,6 +134,8 @@ Fixes :
    * Keep the smart members of the naviframe views whenever resize object is changed. This prevents the dangling view objects of the naviframe and keep the layer consistency.
    * In case of scroll in scroll, the child scroller have to bounce if parents don't have a bounce.
    * Fix elm_scroller_page_show bug. It have to save the wanted values to show the wanted page.
+   * Fix non-scrollable entry did not comply focus_highlight data.
+
 
 Removals:
 

diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 7b2ec51..b2b7396 100644 (file)
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -1114,6 +1114,7 @@ _elm_entry_smart_disable(Evas_Object *obj)
 static Eina_Bool
 _elm_entry_smart_theme(Evas_Object *obj)
 {
+   const char *str;
    const char *t;
    Elm_Widget_Smart_Class *parent_parent =
      (Elm_Widget_Smart_Class *)((Evas_Smart_Class *)
@@ -1191,19 +1192,22 @@ _elm_entry_smart_theme(Evas_Object *obj)
 
    if (sd->scroll)
      {
-        const char *str;
-
         sd->s_iface->mirrored_set(obj, elm_widget_mirrored_get(obj));
 
         elm_widget_theme_object_set
           (obj, sd->scr_edje, "scroller", "entry", elm_widget_style_get(obj));
 
         str = edje_object_data_get(sd->scr_edje, "focus_highlight");
-        if ((str) && (!strcmp(str, "on")))
-          elm_widget_highlight_in_theme_set(obj, EINA_TRUE);
-        else
-          elm_widget_highlight_in_theme_set(obj, EINA_FALSE);
      }
+   else
+     {
+        str = edje_object_data_get(sd->entry_edje, "focus_highlight");
+     }
+
+   if ((str) && (!strcmp(str, "on")))
+     elm_widget_highlight_in_theme_set(obj, EINA_TRUE);
+   else
+     elm_widget_highlight_in_theme_set(obj, EINA_FALSE);
 
    elm_layout_sizing_eval(obj);