[searchbar] Search bar theme is changed according to GUI ver 0.9

Change-Id: Ibe6047f29a2d32b5f10715d8bb1754ae0327c120

Conflicts:

	themes/widgets/entry.edc

1 files changed, 62 insertions, 22 deletions

diff --git a/themes/widgets/entry.edc b/themes/widgets/entry.edc
index 720472db..0fc6f4d1 100644
--- a/themes/widgets/entry.edc
+++ b/themes/widgets/entry.edc
@@ -51,8 +51,6 @@
       scale: 1; \
       description { state: "default" 0.0; \
          align: 1.0 0.5; \
-         min: 0 0; \
-         max: 0 0; \
          fixed: 1 0; \
          rel1 { \
             to_x: "focus_right_padding"; \
@@ -65,8 +63,10 @@
       } \
       description { state: "visible" 0.0; \
          inherit: "default" 0.0; \
-         min: 70 0; \
-         max: 70 0; \
+         rel1 { \
+            to_x: "elm.swallow.clear"; \
+            relative: 0.0 0.0; \
+         } \
       } \
    } \
    part { name: "elm.swallow.clear"; \
@@ -5480,10 +5480,9 @@ group { name: "elm/scroller/entry/default";
             }
          }
          part { name: "bg";
-            type: RECT;
+            type: SPACER;
             scale: 1;
             description { state: "default" 0.0;
-               visible: 0;
             }
          }
          part { name: "clipper";
@@ -5519,8 +5518,6 @@ group { name: "elm/scroller/entry/default";
             clip_to: "clipper";
             description { state: "default" 0.0;
                align: 0.0 0.5;
-               min: 0 0;
-               max: 0 0;
                fixed: 1 1;
                rel1 {
                   to: "bg";
@@ -5533,8 +5530,10 @@ group { name: "elm/scroller/entry/default";
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
-               min: 70 0;
-               max: 70 0;
+               rel2 {
+                  to_x: "elm.swallow.icon";
+                  relative: 1.0 1.0;
+               }
             }
          }
          part { name: "elm.swallow.icon";
@@ -5564,8 +5563,6 @@ group { name: "elm/scroller/entry/default";
             scale: 1;
             description { state: "default" 0.0;
                align: 1.0 0.5;
-               min: 0 0;
-               max: 0 0;
                fixed: 1 1;
                rel1 {
                   to_x: "elm.swallow.end";
@@ -5580,8 +5577,10 @@ group { name: "elm/scroller/entry/default";
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
-               min: 70 0;
-               max: 70 0;
+               rel1 {
+                  to_x: "elm.swallow.clear";
+                  relative: 0.0 0.0;
+               }
             }
          }
          part { name: "elm.swallow.clear";
@@ -6000,8 +5999,6 @@ group { name: "elm/scroller/entry/editfield";
                   border: 8 8 8 8;
                   border_scale: 1;
                }
-               rel1.relative: 0.0 0.0;
-               rel2.relative: 1.0 1.0;
             }
          }
          part { name: "focus_left_padding";
@@ -6066,10 +6063,9 @@ group { name: "elm/scroller/entry/editfield";
             }
          }
          part { name: "bg";
-            type: RECT;
+            type: SPACER;
             scale: 1;
             description { state: "default" 0.0;
-               visible: 0;
                rel1 {
                   to_x: "focus_left_padding";
                   relative: 1.0 0.0;
@@ -6119,8 +6115,6 @@ group { name: "elm/scroller/entry/editfield/searchbar/default";
                   border: 12 13 12 13;
                   border_scale: 1;
                }
-               rel1.relative: 0.0 0.0;
-               rel2.relative: 1.0 1.0;
             }
          }
          part { name: "focus_left_padding";
@@ -6161,6 +6155,7 @@ group { name: "elm/scroller/entry/editfield/searchbar/default";
          }
          part { name: "search_icon_left_padding";
             type: SPACER;
+            scale: 1;
             description { state: "default" 0.0;
                min: ENTRY_SEARCH_ICON_LEFT_PADDING_MIN_MAX_INC;
                max: ENTRY_SEARCH_ICON_LEFT_PADDING_MIN_MAX_INC;
@@ -6178,6 +6173,7 @@ group { name: "elm/scroller/entry/editfield/searchbar/default";
          }
          part { name: "search_icon";
             type: IMAGE;
+            scale: 1;
             mouse_events: 0;
             repeat_events: 1;
             clip_to: "search_icon.clipper";
@@ -6199,6 +6195,7 @@ group { name: "elm/scroller/entry/editfield/searchbar/default";
          }
          part { name: "search_icon_right_padding";
             type: SPACER;
+            scale: 1;
             description { state: "default" 0.0;
                min: ENTRY_SEARCH_ICON_RIGHT_PADDING_MIN_MAX_INC;
                max: ENTRY_SEARCH_ICON_RIGHT_PADDING_MIN_MAX_INC;
@@ -6223,6 +6220,21 @@ group { name: "elm/scroller/entry/editfield/searchbar/default";
                color: ENTRY_SEARCH_ICON_CLIPPER_DISABLED_COLOR_INC;
             }
          }
+         part { name: "search_icon_over";
+            type: RECT;
+            ignore_flags: ON_HOLD;
+            description { state: "default" 0.0;
+               rel1 {
+                  to_x: "search_icon_left_padding";
+                  relative: 0.0 0.0;
+               }
+               rel2 {
+                  to_x: "search_icon_right_padding";
+                  relative: 1.0 1.0;
+               }
+               color: 0 0 0 0;
+            }
+         }
          part { name: "search_icon_disabler";
             type: RECT;
             description { state: "default" 0.0;
@@ -6261,10 +6273,9 @@ group { name: "elm/scroller/entry/editfield/searchbar/default";
             }
          }
          part { name: "bg";
-            type: RECT;
+            type: SPACER;
             scale: 1;
             description { state: "default" 0.0;
-               visible: 0;
                rel1 {
                   to_x: "focus_left_padding";
                   relative: 1.0 0.0;
@@ -6278,6 +6289,30 @@ group { name: "elm/scroller/entry/editfield/searchbar/default";
          part { name: "elm.swallow.content";
             clip_to: "contentclipper";
             scale: 1;
+            clip_to: "clipper";
+            description { state: "default" 0.0;
+               align: 0.0 0.5;
+               fixed: 1 1;
+               rel1 {
+                  to_x: "search_icon_right_padding";
+                  to_y: "bg";
+                  relative: 1.0 0.0;
+               }
+               rel2 {
+                  to_x: "search_icon_right_padding";
+                  to_y: "bg";
+                  relative: 1.0 1.0;
+               }
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               rel2 {
+                  to_x: "elm.swallow.icon";
+                  relative: 1.0 1.0;
+               }
+            }
+         }
+         part { name: "elm.swallow.icon";
             type: SWALLOW;
             description { state: "default" 0.0;
                rel1 {
@@ -6306,6 +6341,11 @@ group { name: "elm/scroller/entry/editfield/searchbar/default";
             action: STATE_SET "default" 0.0;
             target: "focus_image";
          }
+         program { name: "search_icon_touch_snd";
+            signal: "mouse,clicked,1";
+            source: "search_icon_over";
+            action: PLAY_SAMPLE "touch_sound" 1.0;
+         }
          program { name: "disable";
             signal: "elm,state,disabled";
             source: "elm";