[Searchbar] CQ-H0100126920, fixed. alignment/positioning of editfield cursor is corre...

Change-Id: I1b7dbecb440f9fecbda7c7738e2230808693d108

diff --git a/themes/groups/editfield.edc b/themes/groups/editfield.edc
index 1aa89fc..c9539df 100644 (file)
--- a/themes/groups/editfield.edc
+++ b/themes/groups/editfield.edc
@@ -427,7 +427,7 @@ group { name: "elm/editfield/base/default";
 group { name: "elm/editfield/base/searchbar";
    alias: "elm/editfield/base/searchbar/default";
    images {
-      image: "00_field_btn_delete.png" COMP;
+      image: "00_field_btn_clear.png" COMP;
    }
    parts {
       part {
@@ -523,7 +523,7 @@ group { name: "elm/editfield/base/searchbar";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 15 0;
+            min: 0 0;
             fixed: 1 1;
             align: 0 0;
             rel1.relative : 0.0 0.0;
@@ -538,7 +538,7 @@ group { name: "elm/editfield/base/searchbar";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 15 0;
+            min: 0 0;
             fixed: 1 1;
             align: 0 0;
             rel1.relative : 0.0 0.0;
@@ -661,7 +661,7 @@ group { name: "elm/editfield/base/searchbar";
             color: EDITFIELD_TITLE_COLOR_INC;
             text {
                font: "SLP:style=Medium";
-               size: 24;
+               size: 20;
                min: 1 1;
                align: 0.0 0.0;
             }
@@ -755,8 +755,8 @@ group { name: "elm/editfield/base/searchbar";
                to_y : "bottom2";
             }
             image {
-                normal: "00_field_btn_delete.png";
-                border: 10 10 10 10;
+                normal: "00_field_btn_clear.png";
+                border: 4 4 4 4;
                 border_scale: 1;
             }
          }

diff --git a/themes/groups/searchbar.edc b/themes/groups/searchbar.edc
index 5d5875d..5f04a41 100644 (file)
--- a/themes/groups/searchbar.edc
+++ b/themes/groups/searchbar.edc
@@ -198,16 +198,42 @@ group {
                }
             }
          }
-         part { name: "left_text_padding_rect";
+         part { name: "left_padding_search_textfield";
             type: RECT;
             scale: 1;
             description{
                visible: 0;
-               min: 32 0;
+               min: 10 0;
                fixed: 1 0;
-               align: 0 0;
-               rel1 { to_x: "left_padding_rect"; to_y: "base_bg"; };
-               rel2 { relative: 0.0 1.0; to_x: "left_padding_rect"; to_y: "base_bg"; };
+               align: 0.0 0.5;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "search_icon";
+                  to_y: "inputfield_rect";
+               };
+               rel2 {
+                  relative: 1.0 1.0;
+                  to_x: "search_icon";
+                  to_y: "inputfield_rect";
+               };
+            }
+         }
+         part { name: "right_padding_search_textfield";
+            type: RECT;
+            scale: 1;
+            description{
+               visible: 0;
+               min: 5 0;
+               fixed: 1 0;
+               align: 1.0 0.5;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "inputfield_rect";
+               };
+               rel2 {
+                  relative: 1.0 1.0;
+                  to: "inputfield_rect";
+               };
             }
          }
          part {   name: "search_textfield";
@@ -220,17 +246,28 @@ group {
                min: 0 30;
                fixed: 0 1;
                align: 0.0 0.5;
-               rel1 { relative: 1.0 0.5; to_x: "left_text_padding_rect"; to_y: "inputfield_rect"; };
-               rel2 { relative: 0.0 0.5; to_x: "right_padding_rect"; to_y: "inputfield_rect"; };
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "left_padding_search_textfield";
+               };
+               rel2 {
+                  relative: 0.0 1.0;
+                  to: "right_padding_search_textfield";
+               };
             }
             description {
                visible:1;
                state: "in" 0.0;
                min: 0 30;
-               fixed: 0 1;
                align: 0.0 0.5;
-               rel1 { relative: 1.0 0.5; to_x: "left_text_padding_rect"; to_y: "inputfield_rect"; };
-               rel2 { relative: 0.0 0.5; to_x: "right_field_and_btn_padding_rect"; to_y: "inputfield_rect"; };
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "left_padding_search_textfield";
+               };
+               rel2 {
+                  relative: 0.0 1.0;
+                  to: "right_padding_search_textfield";
+               };
             }
             description {
                state: "down" 0.0;

diff --git a/themes/images/nbeat-black/00_field_btn_clear.png b/themes/images/nbeat-black/00_field_btn_clear.png
new file mode 100644 (file)
index 0000000..8359287
Binary files /dev/null and b/themes/images/nbeat-black/00_field_btn_clear.png differ

diff --git a/themes/images/nbeat/00_field_btn_clear.png b/themes/images/nbeat/00_field_btn_clear.png
new file mode 100644 (file)
index 0000000..8359287
Binary files /dev/null and b/themes/images/nbeat/00_field_btn_clear.png differ