[Bug Fix] Unnecessary call of elm_entry_cursor_end_set() in clicked handler and

focus hook was creating issue of cursor positioning.

diff --git a/src/lib/elm_searchbar.c b/src/lib/elm_searchbar.c
index 2c03c72..1db16fd 100644 (file)
--- a/src/lib/elm_searchbar.c
+++ b/src/lib/elm_searchbar.c
@@ -63,14 +63,12 @@ _on_focus_hook(void *data, Evas_Object *obj)
       return;  
    if (elm_widget_focus_get(obj))
      {
-                elm_entry_cursor_end_set(elm_editfield_entry_get(wd->eb));
-
-                if (wd->cancel_btn_show_mode)
-                {
-                        if (wd->cancel_btn_ani_flag) edje_object_signal_emit(wd->base, "CANCELIN", "PROG");
-                        else edje_object_signal_emit(wd->base, "CANCELSHOW", "PROG");
-                }
-        }
+        if (wd->cancel_btn_show_mode)
+          {
+             if (wd->cancel_btn_ani_flag) edje_object_signal_emit(wd->base, "CANCELIN", "PROG");
+             else edje_object_signal_emit(wd->base, "CANCELSHOW", "PROG");
+          }
+     }
 }
 
 static void _sizing_eval(Evas_Object *obj)
@@ -91,12 +89,10 @@ static void _clicked(void *data, Evas_Object *obj, void *event_info)
    Widget_Data *wd = elm_widget_data_get(data);
    if (!wd) return;
 
-   elm_entry_cursor_end_set(elm_editfield_entry_get(wd->eb));
-
    if (wd->cancel_btn_show_mode)
      {
-       if (wd->cancel_btn_ani_flag) edje_object_signal_emit(wd->base, "CANCELIN", "PROG");
-       else edje_object_signal_emit(wd->base, "CANCELSHOW", "PROG");
+        if (wd->cancel_btn_ani_flag) edje_object_signal_emit(wd->base, "CANCELIN", "PROG");
+        else edje_object_signal_emit(wd->base, "CANCELSHOW", "PROG");
      }
 
    evas_object_smart_callback_call(data, "clicked", NULL);
@@ -119,8 +115,8 @@ static void _cancel_clicked(void *data, Evas_Object *obj, void *event_info)
 
    if (wd->cancel_btn_show_mode)
      {
-       if (wd->cancel_btn_ani_flag) edje_object_signal_emit(wd->base, "CANCELOUT", "PROG");
-       else edje_object_signal_emit(wd->base, "CANCELHIDE", "PROG");
+        if (wd->cancel_btn_ani_flag) edje_object_signal_emit(wd->base, "CANCELOUT", "PROG");
+        else edje_object_signal_emit(wd->base, "CANCELHIDE", "PROG");
      }
 
    const char* text;
@@ -293,10 +289,10 @@ EAPI void elm_searchbar_cancel_button_set(Evas_Object *obj, Eina_Bool visible)
 
    if (!visible)
      {
-       if (wd->cancel_btn_ani_flag)
-         edje_object_signal_emit(wd->base, "CANCELOUT", "PROG");
-       else
-         edje_object_signal_emit(wd->base, "CANCELHIDE", "PROG");
+        if (wd->cancel_btn_ani_flag)
+           edje_object_signal_emit(wd->base, "CANCELOUT", "PROG");
+        else
+           edje_object_signal_emit(wd->base, "CANCELHIDE", "PROG");
      }
    _sizing_eval(obj);
 }
@@ -316,10 +312,10 @@ EAPI void elm_searchbar_clear(Evas_Object *obj)
 
    if (wd->cancel_btn_show_mode)
      {
-       if (wd->cancel_btn_ani_flag)
-         edje_object_signal_emit(wd->base, "CANCELOUT", "PROG");
-       else
-         edje_object_signal_emit(wd->base, "CANCELHIDE", "PROG");
+        if (wd->cancel_btn_ani_flag)
+           edje_object_signal_emit(wd->base, "CANCELOUT", "PROG");
+        else
+           edje_object_signal_emit(wd->base, "CANCELHIDE", "PROG");
      }
 //   elm_entry_entry_set(elm_editfield_entry_get(wd->eb), NULL);
 }
@@ -343,11 +339,11 @@ EAPI void elm_searchbar_boundary_rect_set(Evas_Object *obj, Eina_Bool boundary)
 
    if (wd->boundary_mode)
      {
-       edje_object_signal_emit(wd->base, "BDSHOW", "PROG");
+        edje_object_signal_emit(wd->base, "BDSHOW", "PROG");
      }
    else
      {
-       edje_object_signal_emit(wd->base, "BDHIDE", "PROG");
+        edje_object_signal_emit(wd->base, "BDHIDE", "PROG");
      }
    _sizing_eval(obj);
 }