[TC-editifield, entry] fix fails
[framework/uifw/elementary.git] / src / lib / elm_editfield.c
index 3238932..b773f10 100644 (file)
@@ -6,6 +6,13 @@
  * @ingroup Elementary
  *
  * This is a editfield. It can contain a simple label and icon objects.
+ *
+ * Smart callbacks that you can add are:
+ *
+ * clicked - This signal is emitted when an editfield is clicked.
+ *
+ * unfocused - This signal is emitted when an editfield is unfocused.
+ *
  */
 
 //#define ERASER_PADDING (10)
@@ -14,9 +21,8 @@ typedef struct _Widget_Data Widget_Data;
 
 struct _Widget_Data
 {
-   Evas_Object *base;  
+   Evas_Object *base;
    Evas_Object *entry;
-   Evas_Object *scroller;
    Evas_Object *ricon;
    Evas_Object *licon;
    const char *label;
@@ -24,6 +30,7 @@ struct _Widget_Data
    Eina_Bool needs_size_calc:1;
    Eina_Bool show_guide_text:1;
    Eina_Bool editing:1;
+   Eina_Bool clicked:1;
    Eina_Bool single_line:1;
    Eina_Bool eraser_show:1;
 };
@@ -33,13 +40,16 @@ static void _del_hook(Evas_Object *obj);
 static void _theme_hook(Evas_Object *obj);
 static void _sizing_eval(Evas_Object *obj);
 static void _changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info);
+static void _show_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _on_focus_hook(void *data, Evas_Object *obj);
 static Eina_Bool _empty_entry(Evas_Object *entry);
 
-#ifdef HAVE_CONFORMANT_AUTOSCROLL
-static const char SIG_CURSOR_CHANGED[] = "cursor,changed";
-static const char SIG_IMPREGION_CHANGED[] = "impregion,changed";
-#endif
+static const char SIG_FOCUSED[] = "focused";
+
+static const Evas_Smart_Cb_Description _signals[] = {
+   {SIG_FOCUSED, ""},
+   {NULL, NULL}
+};
 
 static void
 _del_hook(Evas_Object *obj)
@@ -50,37 +60,36 @@ _del_hook(Evas_Object *obj)
    free(wd);
 }
 
-#ifdef HAVE_CONFORMANT_AUTOSCROLL
-static Evas_Object *
-_imp_region_get_hook(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
-{
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return NULL;
-   elm_widget_imp_region_get(wd->entry, x, y, w, h);
-   return NULL;
-}
-#endif
-
 static void
-_on_focus_hook(void *data, Evas_Object *obj)
+_on_focus_hook(void *data __UNUSED__, Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd || !wd->base)
-     return ;  
-   if (!elm_widget_focus_get(obj) && !(elm_widget_disabled_get(obj)) ) 
+      return;
+   if (!elm_widget_focus_get(obj))
      {
-       evas_object_smart_callback_call(obj, "unfocused", NULL);
-       wd->editing = EINA_FALSE;
-       edje_object_signal_emit(wd->base, "elm,state,over,show", "elm");                
-       if(_empty_entry(wd->entry)) 
-         {
-            if(wd->guide_text) 
-              {
-                 edje_object_part_text_set(wd->base, "elm.guidetext", wd->guide_text);
-                 edje_object_signal_emit(wd->base, "elm,state,guidetext,visible", "elm");
-                 wd->show_guide_text = EINA_TRUE;
-              }
-         }
+        evas_object_smart_callback_call(obj, "unfocused", NULL);
+        wd->editing = EINA_FALSE;
+        wd->clicked = EINA_FALSE;
+        edje_object_signal_emit(wd->base, "elm,state,over,show", "elm");
+
+        if (!wd->single_line) // FIXME : if textblock works well, delete
+          edje_object_signal_emit(wd->base, "elm,state,entry,show", "elm"); // FIXME : if textblock works well, delete
+
+        edje_object_signal_emit(wd->base, "elm,state,eraser,hidden", "elm");
+        if(_empty_entry(wd->entry))
+          {
+             if(wd->guide_text)
+               {
+                  edje_object_part_text_set(wd->base, "elm.guidetext", wd->guide_text);
+                  edje_object_signal_emit(wd->base, "elm,state,guidetext,visible", "elm");
+                  wd->show_guide_text = EINA_TRUE;
+               }
+          }
+     }
+   else
+     {
+        evas_object_smart_callback_call(obj, SIG_FOCUSED, NULL);
      }
 }
 
@@ -88,34 +97,35 @@ static void
 _theme_hook(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
+   char buf[4096];
    if (!wd || !wd->base)
-     return;
+      return;
+
    _elm_theme_object_set(obj, wd->base, "editfield", "base", elm_widget_style_get(obj));
+   snprintf(buf, sizeof(buf), "editfield/%s", elm_widget_style_get(obj));
+   elm_object_style_set(wd->entry, buf);
+   edje_object_part_swallow(wd->base, "elm.swallow.content", wd->entry);
+   if(!wd->editing)
+      edje_object_signal_emit(wd->base, "elm,state,over,show", "elm");
    if(wd->single_line)
-       edje_object_part_swallow(wd->base, "elm.swallow.content", wd->scroller);
+     edje_object_signal_emit(wd->base, "elm,state,text,singleline", "elm");
    else
-       edje_object_part_swallow(wd->base, "elm.swallow.content", wd->entry);
-   if(!wd->editing)
-     edje_object_signal_emit(wd->base, "elm,state,over,show", "elm");  
-   if (wd->eraser_show) 
-       edje_object_signal_emit(wd->base, "elm,state,eraser,show", "elm");
-   else 
-       edje_object_signal_emit(wd->base, "elm,state,eraser,hidden", "elm");
+     edje_object_signal_emit(wd->base, "elm,state,text,multiline", "elm");
    if(wd->show_guide_text)
      {
-       if(_empty_entry(wd->entry)) 
-         {
-            if(wd->guide_text) 
-              {
-                 edje_object_part_text_set(wd->base, "elm.guidetext", wd->guide_text);
-                 edje_object_signal_emit(wd->base, "elm,state,guidetext,visible", "elm");
-              }
-         }
-     }     
-   if(wd->ricon)       
-     edje_object_part_swallow(wd->base, "right_icon", wd->ricon);
+        if(_empty_entry(wd->entry))
+          {
+             if(wd->guide_text)
+               {
+                  edje_object_part_text_set(wd->base, "elm.guidetext", wd->guide_text);
+                  edje_object_signal_emit(wd->base, "elm,state,guidetext,visible", "elm");
+               }
+          }
+     }
+   if(wd->ricon)
+      edje_object_part_swallow(wd->base, "right_icon", wd->ricon);
    if(wd->licon)
-     edje_object_part_swallow(wd->base, "left_icon", wd->licon);
+      edje_object_part_swallow(wd->base, "left_icon", wd->licon);
    _sizing_eval(obj);
 }
 
@@ -125,40 +135,54 @@ _changed_hook(Evas_Object *obj)
    Widget_Data *wd = elm_widget_data_get(obj);
    if (wd->needs_size_calc)
      {
-       _sizing_eval(obj);
-       wd->needs_size_calc = EINA_FALSE;
+        _sizing_eval(obj);
+        wd->needs_size_calc = EINA_FALSE;
      }
 }
 
 static void
 _sizing_eval(Evas_Object *obj)
 {
-       Widget_Data *wd = elm_widget_data_get(obj);
-       Evas_Coord minw = -1, minh = -1;
-       edje_object_size_min_calc(wd->base, &minw, &minh);
-       evas_object_size_hint_min_set(obj, minw, minh);
-       evas_object_size_hint_max_set(obj, -1, -1);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   Evas_Coord minw = -1, minh = -1;
+   edje_object_size_min_calc(wd->base, &minw, &minh);
+   evas_object_size_hint_min_set(obj, minw, minh);
+   evas_object_size_hint_max_set(obj, -1, -1);
 }
 
 static void
 _request_sizing_eval(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
-   if(!wd || !wd->base) 
-     return;
-   if (wd->needs_size_calc) 
-     return;
+   if(!wd || !wd->base)
+      return;
+   if (wd->needs_size_calc)
+      return;
    wd->needs_size_calc = EINA_TRUE;
    evas_object_smart_changed(obj);
 }
 
 static void
-_changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info)
+_changed_size_hints(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    double weight_x;
    evas_object_size_hint_weight_get(data, &weight_x, NULL);
    if (weight_x == EVAS_HINT_EXPAND)
-     _request_sizing_eval(data);
+      _request_sizing_eval(data);
+}
+
+static void
+_show_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   Widget_Data *wd = elm_widget_data_get(data);
+   if (!wd) return;
+   if ((wd->single_line) && (wd->clicked) && (!wd->editing))  // FIXME : single_line is not needed for this conditional state after TEXTBLOCK fixing
+     {
+        elm_object_focus(wd->entry);
+        elm_entry_cursor_end_set(wd->entry);
+        wd->editing = EINA_TRUE;
+        wd->clicked = EINA_FALSE;
+     }
 }
 
 static Eina_Bool
@@ -169,93 +193,124 @@ _empty_entry(Evas_Object *entry)
    int len = 0;
 
    text = elm_entry_entry_get(entry);
-   if(!text) return EINA_FALSE;
+   if(!text) return EINA_TRUE;
    strip_text = elm_entry_markup_to_utf8(text);
    if (strip_text) {
-       len = strlen(strip_text);
-       free(strip_text);
+        len = strlen(strip_text);
+        free(strip_text);
    }
    if(len == 0)
-     return EINA_TRUE;
-   else 
-     return EINA_FALSE;
+      return EINA_TRUE;
+   else
+      return EINA_FALSE;
 }
 
 static void
-_entry_changed_cb(void *data, Evas_Object *obj, void* event_info)
+_entry_changed_cb(void *data, Evas_Object *obj, void* event_info __UNUSED__)
 {
    Evas_Object *ef_obj = (Evas_Object *)data;
    Widget_Data *wd = elm_widget_data_get(ef_obj);
 
    if(!wd || !wd->base) return;
 
-   if(!_empty_entry(wd->entry)) 
+   if(wd->single_line)
+     {
+        if(elm_entry_password_get(wd->entry))
+          {
+             edje_object_signal_emit(wd->base, "elm,state,password,set", "elm");
+             edje_object_part_text_set(wd->base, "elm.content.password", elm_entry_entry_get(wd->entry));
+          }
+        else
+          {
+             edje_object_signal_emit(wd->base, "elm,state,password,unset", "elm");
+             edje_object_part_text_set(wd->base, "elm.content.single", elm_entry_entry_get(wd->entry));
+          }
+     }
+//   else     // Add after TEXTBLOCK fix
+//     edje_object_part_text_set(wd->base, "elm.content.multi", elm_entry_entry_get(wd->entry));
+
+   if(!_empty_entry(wd->entry))
      {
-       if(wd->guide_text) 
+        if(wd->eraser_show && elm_object_focus_get(obj))
+           edje_object_signal_emit(wd->base, "elm,state,eraser,show", "elm");
+       if(wd->guide_text)
          {
             edje_object_signal_emit(wd->base, "elm,state,guidetext,hidden", "elm");
             wd->show_guide_text = EINA_FALSE;
          }
      }
-}
+   else
+     {
+        if(wd->eraser_show)
+           edje_object_signal_emit(wd->base, "elm,state,eraser,hidden", "elm");
+        if(!elm_object_focus_get(wd->entry))
+          {
+             if(wd->guide_text)
+               {
+                  edje_object_part_text_set(wd->base, "elm.guidetext", wd->guide_text);
+                  edje_object_signal_emit(wd->base, "elm,state,guidetext,visible", "elm");
+                  wd->show_guide_text = EINA_TRUE;
+               }
+          }
+     }
 
-#ifdef HAVE_CONFORMANT_AUTOSCROLL
-static void
-_entry_cursor_changed_cb(void *data, Evas_Object *obj, void* event_info)
-{
-   Evas_Object *ef_obj = (Evas_Object *)data;
-   evas_object_smart_callback_call(ef_obj, SIG_IMPREGION_CHANGED, NULL);
+   if (!wd->editing && wd->single_line)
+     edje_object_signal_emit(wd->base, "elm,state,over,show", "elm");
 }
-#endif
 
 static void
-_signal_mouse_clicked(void *data, Evas_Object *obj, const char *emission, const char *source)
+_signal_mouse_clicked(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source)
 {
    Widget_Data *wd = elm_widget_data_get(data);
    if(!wd || !wd->base) return;
 
    if(!strcmp(source, "eraser"))
-   {
-          elm_entry_entry_set(wd->entry, "");
-          if(wd->editing == EINA_FALSE) {
-                  if(wd->guide_text) 
-                  {
-                          edje_object_part_text_set(wd->base, "elm.guidetext", wd->guide_text);
-                          edje_object_signal_emit(wd->base, "elm,state,guidetext,visible", "elm");
-                          wd->show_guide_text = EINA_TRUE;
-                  }
-          }
-   }      
+     {
+        elm_entry_entry_set(wd->entry, "");
+        edje_object_signal_emit(wd->base, "elm,state,eraser,hidden", "elm");
+     }
    else if(strcmp(source, "left_icon") && strcmp(source, "right_icon") && strcmp(source, "eraser"))
      {
-       edje_object_signal_emit(wd->base, "elm,state,over,hide", "elm");
-       if(wd->single_line)
-               elm_widget_focus_set(wd->scroller, EINA_TRUE);
-       else    
-               elm_widget_focus_set(wd->entry, EINA_TRUE);                     
-
-       if(wd->editing == EINA_FALSE)
-         elm_entry_cursor_end_set(wd->entry);
-       
-       if(wd->guide_text) 
-          {
-                 edje_object_signal_emit(wd->base, "elm,state,guidetext,hidden", "elm");
-                 wd->show_guide_text = EINA_FALSE;
-          }
-       evas_object_smart_callback_call(data, "clicked", NULL);
-       wd->editing = EINA_TRUE;
+        edje_object_signal_emit(wd->base, "elm,state,over,hide", "elm");
+        wd->clicked = EINA_TRUE;
+
+        if ((!wd->single_line) && (!wd->editing)) //FIXME : after fixing TEXTBLOCK, this should be deleted
+          {
+             elm_object_focus(wd->entry);
+             elm_entry_cursor_end_set(wd->entry);
+             wd->editing = EINA_TRUE;
+          }
+
+        if(!(_empty_entry(wd->entry)) && (wd->eraser_show))
+           edje_object_signal_emit(wd->base, "elm,state,eraser,show", "elm");
+
+        if(wd->guide_text)
+          {
+             edje_object_signal_emit(wd->base, "elm,state,guidetext,hidden", "elm");
+             wd->show_guide_text = EINA_FALSE;
+          }
+        evas_object_smart_callback_call(data, "clicked", NULL);
      }
 }
 
 static void
-_resize_cb(void *data, Evas *evas, Evas_Object *obj, void *event)
+_resize_cb(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event __UNUSED__)
 {
-   Widget_Data *wd = elm_widget_data_get(data);        
+   Widget_Data *wd = elm_widget_data_get(data);
    Evas_Coord h;
    if (!wd || !wd->base) return;
    evas_object_geometry_get(obj, NULL, NULL, NULL, &h);
 }
 
+static void
+_signal_emit_hook(Evas_Object *obj, const char *emission, const char *source)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   edje_object_signal_emit(wd->base, emission, source);
+}
+
+
 /**
  * Add a new editfield object
  *
@@ -273,7 +328,7 @@ elm_editfield_add(Evas_Object *parent)
 
    e = evas_object_evas_get(parent);
    if (e == NULL)
-     return NULL;
+      return NULL;
    wd = ELM_NEW(Widget_Data);
    obj = elm_widget_add(e);
    ELM_SET_WIDTYPE(widtype, "editfield");
@@ -284,36 +339,35 @@ elm_editfield_add(Evas_Object *parent)
    elm_widget_theme_hook_set(obj, _theme_hook);
    elm_widget_changed_hook_set(obj, _changed_hook);
    elm_widget_on_focus_hook_set( obj, _on_focus_hook, NULL );
+   elm_widget_signal_emit_hook_set(obj, _signal_emit_hook);
    elm_widget_can_focus_set(obj, EINA_TRUE);
-#ifdef HAVE_CONFORMANT_AUTOSCROLL
-   elm_widget_imp_region_get_hook_set(obj, _imp_region_get_hook, NULL);
-#endif
 
    wd->base = edje_object_add(e);
    _elm_theme_object_set(obj, wd->base, "editfield", "base", "default");
    elm_widget_resize_object_set(obj, wd->base);
-   edje_object_signal_callback_add(wd->base, "mouse,clicked,1", "*", 
-        _signal_mouse_clicked, obj);
+   edje_object_signal_callback_add(wd->base, "mouse,clicked,1", "*",
+                                   _signal_mouse_clicked, obj);
+   edje_object_signal_callback_add(wd->base, "clicked", "*",
+                                   _signal_mouse_clicked, obj);
+
    evas_object_event_callback_add(wd->base, EVAS_CALLBACK_RESIZE, _resize_cb, obj);
 
    wd->editing = EINA_FALSE;
+   wd->clicked = EINA_FALSE;
    wd->single_line = EINA_FALSE;
-   wd->eraser_show = EINA_FALSE;
+   wd->eraser_show = EINA_TRUE;
 
    wd->entry = elm_entry_add(obj);
    elm_object_style_set(wd->entry, "editfield");
    evas_object_size_hint_weight_set(wd->entry, 0, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(wd->entry, 0, EVAS_HINT_FILL);
-   evas_object_event_callback_add(wd->entry,
-        EVAS_CALLBACK_CHANGED_SIZE_HINTS,
-        _changed_size_hints, obj);
+   evas_object_event_callback_add(wd->entry, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj);
+   evas_object_event_callback_add(wd->entry, EVAS_CALLBACK_SHOW, _show_cb, obj);
    edje_object_part_swallow(wd->base, "elm.swallow.content", wd->entry);
    evas_object_smart_callback_add(wd->entry, "changed", _entry_changed_cb, obj);
    elm_widget_sub_object_add(obj, wd->entry);
-#ifdef HAVE_CONFORMANT_AUTOSCROLL
-   evas_object_smart_callback_add(wd->entry, SIG_CURSOR_CHANGED, _entry_cursor_changed_cb, obj); 
-#endif
-
+   evas_object_show(wd->entry);
+   evas_object_smart_callbacks_descriptions_set(obj, _signals);
    _sizing_eval(obj);
 
    return obj;
@@ -332,21 +386,21 @@ elm_editfield_label_set(Evas_Object *obj, const char *label)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    ELM_CHECK_WIDTYPE(obj, widtype);
-   if (!wd || !wd->base) 
-     return;
-   if (wd->label) 
-     eina_stringshare_del(wd->label);
-   if (label) 
+   if (!wd || !wd->base)
+      return;
+   if (wd->label)
+      eina_stringshare_del(wd->label);
+   if (label)
      {
-       wd->label = eina_stringshare_add(label);
-       edje_object_signal_emit(wd->base, "elm,state,text,visible", "elm");
-       edje_object_signal_emit(wd->base, "elm,state,left,icon,hide", "elm");
+        wd->label = eina_stringshare_add(label);
+        edje_object_signal_emit(wd->base, "elm,state,text,visible", "elm");
+        edje_object_signal_emit(wd->base, "elm,state,left,icon,hide", "elm");
      }
-   else 
+   else
      {
-       wd->label = NULL;
-       edje_object_signal_emit(wd->base, "elm,state,text,hidden", "elm");
-       edje_object_signal_emit(wd->base, "elm,state,left,icon,show", "elm");
+        wd->label = NULL;
+        edje_object_signal_emit(wd->base, "elm,state,text,hidden", "elm");
+        edje_object_signal_emit(wd->base, "elm,state,left,icon,show", "elm");
      }
    edje_object_message_signal_process(wd->base);
    edje_object_part_text_set(wd->base, "elm.text", label);
@@ -366,9 +420,9 @@ elm_editfield_label_get(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
-   if (!wd || !wd->base) 
-     return NULL;
-   return      wd->label;
+   if (!wd || !wd->base)
+      return NULL;
+   return wd->label;
 }
 
 /**
@@ -385,17 +439,17 @@ elm_editfield_guide_text_set(Evas_Object *obj, const char *text)
    Widget_Data *wd = elm_widget_data_get(obj);
    ELM_CHECK_WIDTYPE(obj, widtype);
    if (!wd || !wd->base)
-     return;
-   if (wd->guide_text) 
-     eina_stringshare_del(wd->guide_text);
-   if (text) 
+      return;
+   if (wd->guide_text)
+      eina_stringshare_del(wd->guide_text);
+   if (text)
      {
-       wd->guide_text = eina_stringshare_add(text);
-       edje_object_part_text_set(wd->base, "elm.guidetext", wd->guide_text);
-       wd->show_guide_text = EINA_TRUE;
+        wd->guide_text = eina_stringshare_add(text);
+        edje_object_part_text_set(wd->base, "elm.guidetext", wd->guide_text);
+        wd->show_guide_text = EINA_TRUE;
      }
    else
-     wd->guide_text = NULL;
+      wd->guide_text = NULL;
 }
 
 /**
@@ -412,7 +466,7 @@ elm_editfield_guide_text_get(Evas_Object *obj)
    Widget_Data *wd = elm_widget_data_get(obj);
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    if (!wd || !wd->base)
-     return NULL;
+      return NULL;
    return wd->guide_text;
 }
 
@@ -431,7 +485,7 @@ elm_editfield_entry_get(Evas_Object *obj)
    Widget_Data *wd = elm_widget_data_get(obj);
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    if (!wd)
-     return NULL;
+      return NULL;
    return wd->entry;
 }
 
@@ -443,27 +497,26 @@ elm_editfield_entry_get(Evas_Object *obj)
  *
  * @ingroup Editfield
  */
-EAPI void 
+EAPI void
 elm_editfield_left_icon_set(Evas_Object *obj, Evas_Object *icon)
 {
-   Widget_Data *wd = elm_widget_data_get(obj); 
-   ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE; 
+   Widget_Data *wd = elm_widget_data_get(obj);
+   ELM_CHECK_WIDTYPE(obj, widtype) ;
    if (!wd || !wd->base || !icon)
-     return;
+      return;
    if ((wd->licon != icon) && (wd->licon))
-     elm_widget_sub_object_del(obj, wd->licon);        
+      elm_widget_sub_object_del(obj, wd->licon);
    if (icon)
      {
-       if (!(edje_object_part_swallow(wd->base, "left_icon", icon)))
-         return;               
-       wd->licon = icon;
-       elm_widget_sub_object_add(obj, icon);
-       evas_object_event_callback_add(icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
-             _changed_size_hints, obj);
-       edje_object_signal_emit(wd->base, "elm,state,left,icon,show", "elm");
-       edje_object_signal_emit(wd->base, "elm,state,text,hidden", "elm");
-       _sizing_eval(obj);
-     } 
+        edje_object_part_swallow(wd->base, "left_icon", icon);
+        wd->licon = icon;
+        elm_widget_sub_object_add(obj, icon);
+        evas_object_event_callback_add(icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                       _changed_size_hints, obj);
+        edje_object_signal_emit(wd->base, "elm,state,left,icon,show", "elm");
+        edje_object_signal_emit(wd->base, "elm,state,text,hidden", "elm");
+        _sizing_eval(obj);
+     }
    return;
 }
 
@@ -478,10 +531,10 @@ elm_editfield_left_icon_set(Evas_Object *obj, Evas_Object *icon)
 EAPI Evas_Object *
 elm_editfield_left_icon_get(Evas_Object *obj)
 {
-   Widget_Data *wd = elm_widget_data_get(obj);         
-   ELM_CHECK_WIDTYPE(obj, widtype) NULL;       
-   if (!wd || !wd->base || !wd->licon) 
-     return NULL;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   if (!wd || !wd->base || !wd->licon)
+      return NULL;
    return wd->licon;
 }
 
@@ -493,26 +546,25 @@ elm_editfield_left_icon_get(Evas_Object *obj)
  *
  * @ingroup Editfield
  */
-EAPI void 
+EAPI void
 elm_editfield_right_icon_set(Evas_Object *obj, Evas_Object *icon)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
-   ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
+   ELM_CHECK_WIDTYPE(obj, widtype) ;
    if (!wd || !wd->base || !icon)
-     return;
+      return;
    if ((wd->ricon != icon) && (wd->ricon))
-     elm_widget_sub_object_del(obj, wd->ricon);        
+      elm_widget_sub_object_del(obj, wd->ricon);
    if (icon)
      {
-       if ( !(edje_object_part_swallow(wd->base, "right_icon", icon)) )
-         return;                               
-       wd->ricon = icon;
-       elm_widget_sub_object_add(obj, icon);
-       evas_object_event_callback_add(icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
-             _changed_size_hints, obj);                
-       edje_object_signal_emit(wd->base, "elm,state,right,icon,show", "elm");
-       _sizing_eval(obj);
-     } 
+        edje_object_part_swallow(wd->base, "right_icon", icon);
+        wd->ricon = icon;
+        elm_widget_sub_object_add(obj, icon);
+        evas_object_event_callback_add(icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                       _changed_size_hints, obj);
+        edje_object_signal_emit(wd->base, "elm,state,right,icon,show", "elm");
+        _sizing_eval(obj);
+     }
    return;
 }
 
@@ -528,16 +580,16 @@ EAPI Evas_Object *
 elm_editfield_right_icon_get(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
-   ELM_CHECK_WIDTYPE(obj, widtype) NULL;       
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    if (!wd || !wd->base || !wd->ricon)
-     return NULL;
+      return NULL;
    return wd->ricon;
 }
 
 /**
  * Set entry object style as single-line or multi-line.
  *
- * @param obj The editfield object  
+ * @param obj The editfield object
  * @param single_line 1 if single-line , 0 if multi-line
  *
  * @ingroup Editfield
@@ -546,51 +598,31 @@ EAPI void
 elm_editfield_entry_single_line_set(Evas_Object *obj, Eina_Bool single_line)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
-   Evas_Object *entry;
-   ELM_CHECK_WIDTYPE(obj, widtype);       
-   if (!wd || !wd->base || wd->single_line == single_line) 
-     return;
-   wd->single_line = single_line;
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   if (!wd || !wd->base || wd->single_line == single_line)
+      return;
+   wd->single_line = !!single_line;
    elm_entry_single_line_set(wd->entry, single_line);
-   if(single_line) {
-          if(!wd->scroller){
-                  wd->scroller = elm_scroller_add(obj);
-                  elm_scroller_bounce_set(wd->scroller, 0, 0);
-                  elm_scroller_policy_set(wd->scroller, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
-                  elm_widget_sub_object_add(obj, wd->scroller);
-                  elm_scroller_content_min_limit(wd->scroller, 0, 1);
-          }
-          edje_object_part_unswallow(wd->base, wd->entry);
-          edje_object_part_swallow(wd->base, "elm.swallow.content", wd->scroller);
-          evas_object_size_hint_weight_set(wd->entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-          evas_object_size_hint_align_set(wd->entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
-
-          elm_scroller_content_set(wd->scroller, wd->entry);
-   }
-   else {
-          entry = elm_entry_add(obj);
-          elm_object_style_set(entry, "editfield");
-          evas_object_size_hint_weight_set(entry, 0, EVAS_HINT_EXPAND);
-          evas_object_size_hint_align_set(entry, 0, EVAS_HINT_FILL);
-          evas_object_event_callback_add(entry,
-                          EVAS_CALLBACK_CHANGED_SIZE_HINTS,
-                          _changed_size_hints, obj);
-          edje_object_part_swallow(wd->base, "elm.swallow.content", entry);
-          evas_object_smart_callback_add(entry, "changed", _entry_changed_cb, obj);
-          elm_widget_sub_object_add(obj, entry);
-          elm_entry_entry_set(entry, elm_entry_entry_get(wd->entry));
-          if(wd->scroller)
-                  edje_object_part_unswallow(wd->base, wd->scroller);
-          evas_object_del(wd->entry);
-          wd->entry = entry;
-          edje_object_part_swallow(wd->base, "elm.swallow.content", wd->entry);
-   }
+   if(single_line)
+     {
+        elm_entry_scrollable_set(wd->entry, EINA_TRUE);
+        elm_entry_single_line_set(wd->entry,EINA_TRUE);
+        edje_object_signal_emit(wd->base, "elm,state,text,singleline", "elm");
+     }
+   else
+     {
+        elm_entry_scrollable_set(wd->entry, EINA_FALSE);
+        elm_entry_single_line_set(wd->entry,EINA_FALSE);
+        edje_object_signal_emit(wd->base, "elm,state,text,multiline", "elm");
+     }
+   if (!wd->editing)
+     edje_object_signal_emit(wd->base, "elm,state,over,show", "elm");
 }
 
 /**
  * Get the current entry object style(single-line or multi-line)
  *
- * @param obj The editfield object  
+ * @param obj The editfield object
  * @return 1 if single-line , 0 if multi-line
  *
  * @ingroup Editfield
@@ -599,17 +631,17 @@ EAPI Eina_Bool
 elm_editfield_entry_single_line_get(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
-   ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE; 
+   ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
    if (!wd || !wd->base)
-     return EINA_FALSE;
+      return EINA_FALSE;
    return wd->single_line;
 }
 
 /**
  * Set enable user to clean all of text.
  *
- * @param obj The editfield object  
- * @param visible If true, the eraser is visible and user can clean all of text by using eraser.  
+ * @param obj The editfield object
+ * @param visible If true, the eraser is visible and user can clean all of text by using eraser.
  * If false, the eraser is invisible.
  *
  * @ingroup Editfield
@@ -618,24 +650,22 @@ EAPI void
 elm_editfield_eraser_set(Evas_Object *obj, Eina_Bool visible)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
-   ELM_CHECK_WIDTYPE(obj, widtype);    
+   ELM_CHECK_WIDTYPE(obj, widtype);
    if (!wd || !wd->base)
-     return;
-   
-   wd->eraser_show = visible;
-
-   if (visible) 
-       edje_object_signal_emit(wd->base, "elm,state,eraser,show", "elm");
-   else 
-       edje_object_signal_emit(wd->base, "elm,state,eraser,hidden", "elm");
-   
-   return; 
+      return;
+
+   wd->eraser_show = !!visible;
+
+   if (!visible)
+      edje_object_signal_emit(wd->base, "elm,state,eraser,hidden", "elm");
+
+   return;
 }
 
 /**
  * Get the current state of erase (visible/invisible)
  *
- * @param obj The editfield object  
+ * @param obj The editfield object
  * @return 1 if visible, 0 if invisible
  *
  * @ingroup Editfield
@@ -644,8 +674,10 @@ EAPI Eina_Bool
 elm_editfield_eraser_get(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
-   ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE; 
+   ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
    if (!wd || !wd->base)
-     return EINA_FALSE;
+      return EINA_FALSE;
    return wd->eraser_show;
 }
+
+/* vim:set ts=8 sw=3 sts=3 expandtab cino=>5n-2f0^-2{2(0W1st0 :*/