[TSAM-5435] Search bar issue resolved

Change-Id: I351b15cbe3f7aaf41ed081fc63c6903a7cebcb6c
Signed-off-by: shubham kumar <shubham.srib@samsung.com>

diff --git a/res/edje/entry.edc b/res/edje/entry.edc
index 97b7a84..89e32fa 100644 (file)
--- a/res/edje/entry.edc
+++ b/res/edje/entry.edc
@@ -145,26 +145,7 @@ images {
             color: 255 255 255 255;
          }
       }
-      part { name: "right_btn_padding_rect";
-         type: SPACER;
-         //scale: 1;
-         description { state: "default" 0.0;
-            min: 0 0;
-            //fixed: 1 0;
-            align: 1.0 0.0;
-            rel1.relative: 0.0 0.0;
-            rel1.to: "right_padding_rect";
-            rel2.relative: 0.0 1.0;
-            rel2.to: "right_padding_rect";
-         }
-         description { state: "in" 0.0;
-            inherit: "default" 0.0;
-            min: SEARCHBAR_CANCEL_BUTTON_LEFT_PADDING_INC 0;
-            rel1.to: "button_cancel";
-            rel2.to: "button_cancel";
-         }
-      }
-      part { name: "button_cancel";
+       part { name: "button_cancel";
          type: RECT;
          mouse_events: 1;
          //scale: 1;

diff --git a/res/edje/search_bar.edc b/res/edje/search_bar.edc
index 8a6d282..c4e5c07 100644 (file)
--- a/res/edje/search_bar.edc
+++ b/res/edje/search_bar.edc
@@ -34,7 +34,6 @@ group { name: "elm/layout/application/search_view_layout_hd";
                                description {
                                state: "default" 0.0;
                                min: 720 105;
-                               max: 720 105;
                                fixed: 0 1;
                                align: 0.5 0.0;
                                rel1 { relative: 0.0 0.0; to:"background";}
@@ -49,7 +48,6 @@ group { name: "elm/layout/application/search_view_layout_hd";
                        description {
                                state: "default" 0.0;
                                align: 0.5 0.0;
-                               fixed: 0 1;
                                rel1 { relative: 0.0 1.0; to_y:"search_bar";}
                                rel2 { relative: 1.0 1.0;}
                                }
@@ -168,7 +166,6 @@ parts {
                description {
                        state: "default" 0.0;
                        color: 60 181 199 255;
-                       fixed: 0 1;
                        align: 0.0 1.0;
                        rel1
                        {
@@ -276,7 +273,6 @@ parts {
                //scale: 1;
                description {
                        state: "default" 0.0;
-                       fixed: 1 1;
                        rel1
                        {
                                relative: 0.0 0.0; to: "searching_bg";

diff --git a/src/widget/mp-search.c b/src/widget/mp-search.c
index ed36213..e2a54f3 100644 (file)
--- a/src/widget/mp-search.c
+++ b/src/widget/mp-search.c
@@ -125,8 +125,7 @@ mp_search_create_new(Evas_Object * parent, Evas_Smart_Cb change_cb, void *change
        elm_entry_input_panel_return_key_type_set(en, ELM_INPUT_PANEL_RETURN_KEY_TYPE_SEARCH);
 
        evas_object_size_hint_weight_set(searchfield, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       evas_object_size_hint_align_set(searchfield, EVAS_HINT_FILL, 0.0);
-       elm_entry_text_style_user_push(en, style);
+       evas_object_size_hint_align_set(searchfield, EVAS_HINT_FILL, EVAS_HINT_FILL);
        mp_util_domain_translatable_part_text_set(en, "elm.guide", STR_SEARCH_GUIDE);
        evas_object_smart_callback_add(en, "changed", _mp_searchfield_changed_cb, searchfield);
        elm_object_signal_callback_add(searchfield, "elm,eraser,clicked", "elm", _mp_search_eraser_clicked_cb, en);