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

Change-Id: Ibe6047f29a2d32b5f10715d8bb1754ae0327c120

Conflicts:

	themes/widgets/entry.edc

diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc
index 1c83648..554a801 100755 (executable)
--- a/themes/inc/tizen-dark-inc.edc
+++ b/themes/inc/tizen-dark-inc.edc
@@ -573,12 +573,14 @@
 #define BUTTON_DEFAULT_STYLE_MULTILINE_BG_MIN_INC 100 80
 #define BUTTON_DEFAULT_STYLE_MULTILINE_PADDING_MIN_INC 12 0
 
-#define BUTTON_EDITFIELD_CLEAR_BUTTON_MIN_MAX_INC 54 54
+#define BUTTON_EDITFIELD_CLEAR_BUTTON_MIN_MAX_INC 60 60
+#define BUTTON_EDITFIELD_CLEAR_BUTTON_IMAGE_MIN_MAX_INC 54 54
 #define BUTTON_EDITFIELD_CLEAR_BUTTON_CLIPPER_DEFAULT_COLOR_INC 72 93 147 255
 #define BUTTON_EDITFIELD_CLEAR_BUTTON_CLIPPER_PRESSED_COLOR_INC 250 250 250 255
 #define BUTTON_EDITFIELD_CLEAR_BUTTON_CLIPPER_DISABLED_COLOR_INC 72 93 147 153
 
-#define BUTTON_SEARCH_CLEAR_BUTTON_MIN_MAX_INC 45 45
+#define BUTTON_SEARCH_CLEAR_BUTTON_MIN_MAX_INC 60 60
+#define BUTTON_SEARCH_CLEAR_BUTTON_IMAGE_MIN_MAX_INC 45 45
 #define BUTTON_SEARCH_CLEAR_BUTTON_CLIPPER_DEFAULT_COLOR_INC 93 97 118 255
 #define BUTTON_SEARCH_CLEAR_BUTTON_CLIPPER_PRESSED_COLOR_INC 42 57 172 255
 #define BUTTON_SEARCH_CLEAR_BUTTON_CLIPPER_DISABLED_COLOR_INC 93 97 118 153
@@ -796,10 +798,10 @@
 #define POPUP_BASE_DEFAULT_TEXT_FONT_SIZE_INC 50
 #define POPUP_DESCRIPTION_DEFAULT_TEXT_FONT_SIZE_INC 38
 
-#define POPUP_BASE_DEFAULT_BASE_DEFAULT_MIN_INC 652 0
-#define POPUP_BASE_DEFAULT_BASE_DEFAULT_MAX_INC 652 1120
-#define POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MIN_INC 832 0
-#define POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MAX_INC 832 720
+#define POPUP_BASE_DEFAULT_BASE_DEFAULT_MIN_INC 652 600
+#define POPUP_BASE_DEFAULT_BASE_DEFAULT_MAX_INC 652 600
+#define POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MIN_INC 832 500
+#define POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MAX_INC 832 500
 #define POPUP_BASE_DEFAULT_BG_DEFAULT_IMAGE_BORDER_INC 26 26 32 47
 #define POPUP_BASE_DEFAULT_TITLE_DEFAULT_IMAGE_BORDER_INC 12 13 30 31
 #define POPUP_BASE_DEFAULT_BUTTON_BG_IMAGE_BORDER_INC 12 13 30 31
@@ -808,7 +810,7 @@
 #define POPUP_BASE_DEFAULT_PADDING_MIN_MAX_INC 26 0
 #define POPUP_BASE_DEFAULT_TITLE_ICON_DEFAULT_MIN_MAX_INC 64 64
 #define POPUP_BASE_DEFAULT_CONTENT_DEFAULT_MIN_MAX_INC 630 300
-#define POPUP_BASE_DEFAULT_CONTENT_LANDSCAPE_MIN_MAX_INC 810 300
+#define POPUP_BASE_DEFAULT_CONTENT_LANDSCAPE_MIN_MAX_INC 810 400
 #define POPUP_BASE_DEFAULT_BUTTON_BG_DEFAULT_MIN_INC 596 96
 
 #define POPUP_DESC_LEFT_PADDING 16
@@ -828,8 +830,8 @@
 #define POPUP_CONTENT_DEFAULT_PADDING_LEFT_MIN_INC 42
 #define POPUP_CONTENT_DEFAULT_PADDING_RIGHT_MIN_INC 42
 #define POPUP_CONTENT_DEFAULT_PADDING_BOTTOM_MIN_INC 32
-#define POPUP_CONTENT_DEFAULT_CONTENT_DEFAULT_MIN_INC 630 0
-#define POPUP_CONTENT_DEFAULT_CONTENT_LANDSCAPE_MIN_INC 810 0
+#define POPUP_CONTENT_DEFAULT_CONTENT_DEFAULT_MIN_INC 630 300
+#define POPUP_CONTENT_DEFAULT_CONTENT_LANDSCAPE_MIN_INC 810 300
 
 #define POPUP_BASE_CONTENT_EXPAND_BG_DEFAULT_MIN_INC 0 96
 #define POPUP_BASE_CONTENT_EXPAND_TITLE_DEFAULT_MIN_INC 0 78
@@ -848,8 +850,8 @@
 
 #define POPUP_CONTENT_MINSTYLE_LEFT_PADDING_MIN_INC 16
 #define POPUP_CONTENT_MINSTYLE_RIGHT_PADDING_MIN_INC 16
-#define POPUP_CONTENT_MINSTYLE_CONTENT_DEFAULT_MIN_INC 568 0
-#define POPUP_CONTENT_MINSTYLE_CONTENT_LANDSCAPE_MIN_INC 866 0
+#define POPUP_CONTENT_MINSTYLE_CONTENT_DEFAULT_MIN_INC 568 300
+#define POPUP_CONTENT_MINSTYLE_CONTENT_LANDSCAPE_MIN_INC 866 300
 #define POPUP_CONTENT_VOLUMEBAR_STYLE_CONTENT_DEFAULT_MIN_INC 648 300
 #define POPUP_CONTENT_VOLUMEBAR_TEXT_STYLE_CONTENT_DEFAULT_MIN_INC 648 250
 #define POPUP_BASE_VOLUMEBAR_STYLE_BUTTONAREA_BG_DEFAULT_MIN_INC 648 134

diff --git a/themes/inc/tizen-light-inc.edc b/themes/inc/tizen-light-inc.edc
index 8291071..4308147 100755 (executable)
--- a/themes/inc/tizen-light-inc.edc
+++ b/themes/inc/tizen-light-inc.edc
@@ -572,12 +572,14 @@
 #define BUTTON_DEFAULT_STYLE_MULTILINE_BG_MIN_INC 100 80
 #define BUTTON_DEFAULT_STYLE_MULTILINE_PADDING_MIN_INC 12 0
 
-#define BUTTON_EDITFIELD_CLEAR_BUTTON_MIN_MAX_INC 54 54
+#define BUTTON_EDITFIELD_CLEAR_BUTTON_MIN_MAX_INC 60 60
+#define BUTTON_EDITFIELD_CLEAR_BUTTON_IMAGE_MIN_MAX_INC 54 54
 #define BUTTON_EDITFIELD_CLEAR_BUTTON_CLIPPER_DEFAULT_COLOR_INC 128 128 128 255
 #define BUTTON_EDITFIELD_CLEAR_BUTTON_CLIPPER_PRESSED_COLOR_INC 59 115 182 255
 #define BUTTON_EDITFIELD_CLEAR_BUTTON_CLIPPER_DISABLED_COLOR_INC 128 128 128 128
 
-#define BUTTON_SEARCH_CLEAR_BUTTON_MIN_MAX_INC 45 45
+#define BUTTON_SEARCH_CLEAR_BUTTON_MIN_MAX_INC 60 60
+#define BUTTON_SEARCH_CLEAR_BUTTON_IMAGE_MIN_MAX_INC 45 45
 #define BUTTON_SEARCH_CLEAR_BUTTON_CLIPPER_DEFAULT_COLOR_INC 135 133 128 255
 #define BUTTON_SEARCH_CLEAR_BUTTON_CLIPPER_PRESSED_COLOR_INC 59 115 182 255
 #define BUTTON_SEARCH_CLEAR_BUTTON_CLIPPER_DISABLED_COLOR_INC 135 133 128 128
@@ -795,10 +797,10 @@
 #define POPUP_BASE_DEFAULT_TEXT_FONT_SIZE_INC 50
 #define POPUP_DESCRIPTION_DEFAULT_TEXT_FONT_SIZE_INC 38
 
-#define POPUP_BASE_DEFAULT_BASE_DEFAULT_MIN_INC 652 0
-#define POPUP_BASE_DEFAULT_BASE_DEFAULT_MAX_INC 652 1120
-#define POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MIN_INC 832 0
-#define POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MAX_INC 832 720
+#define POPUP_BASE_DEFAULT_BASE_DEFAULT_MIN_INC 652 600
+#define POPUP_BASE_DEFAULT_BASE_DEFAULT_MAX_INC 652 600
+#define POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MIN_INC 832 450
+#define POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MAX_INC 832 450
 #define POPUP_BASE_DEFAULT_BG_DEFAULT_IMAGE_BORDER_INC 26 26 32 47
 #define POPUP_BASE_DEFAULT_TITLE_DEFAULT_IMAGE_BORDER_INC 12 13 30 31
 #define POPUP_BASE_DEFAULT_BUTTON_BG_IMAGE_BORDER_INC 12 13 30 31
@@ -807,7 +809,7 @@
 #define POPUP_BASE_DEFAULT_PADDING_MIN_MAX_INC 26 0
 #define POPUP_BASE_DEFAULT_TITLE_ICON_DEFAULT_MIN_MAX_INC 64 64
 #define POPUP_BASE_DEFAULT_CONTENT_DEFAULT_MIN_MAX_INC 630 300
-#define POPUP_BASE_DEFAULT_CONTENT_LANDSCAPE_MIN_MAX_INC 810 300
+#define POPUP_BASE_DEFAULT_CONTENT_LANDSCAPE_MIN_MAX_INC 810 400
 #define POPUP_BASE_DEFAULT_BUTTON_BG_DEFAULT_MIN_INC 596 96
 
 #define POPUP_DESC_LEFT_PADDING 16
@@ -847,8 +849,8 @@
 
 #define POPUP_CONTENT_MINSTYLE_LEFT_PADDING_MIN_INC 16
 #define POPUP_CONTENT_MINSTYLE_RIGHT_PADDING_MIN_INC 16
-#define POPUP_CONTENT_MINSTYLE_CONTENT_DEFAULT_MIN_INC 568 0
-#define POPUP_CONTENT_MINSTYLE_CONTENT_LANDSCAPE_MIN_INC 866 0
+#define POPUP_CONTENT_MINSTYLE_CONTENT_DEFAULT_MIN_INC 568 300
+#define POPUP_CONTENT_MINSTYLE_CONTENT_LANDSCAPE_MIN_INC 866 300
 #define POPUP_CONTENT_VOLUMEBAR_STYLE_CONTENT_DEFAULT_MIN_INC 648 300
 #define POPUP_CONTENT_VOLUMEBAR_TEXT_STYLE_CONTENT_DEFAULT_MIN_INC 648 250
 #define POPUP_BASE_VOLUMEBAR_STYLE_BUTTONAREA_BG_DEFAULT_MIN_INC 648 134

diff --git a/themes/widgets/button.edc b/themes/widgets/button.edc
index 695ef8d..2e3f4d6 100644 (file)
--- a/themes/widgets/button.edc
+++ b/themes/widgets/button.edc
@@ -5876,6 +5876,15 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
          image: "00_edit_field_clear.png" COMP;
       }
       parts {
+         part { name: "bg";
+            type: SPACER;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               min: BUTTON_EDITFIELD_CLEAR_BUTTON_MIN_MAX_INC;
+               max: BUTTON_EDITFIELD_CLEAR_BUTTON_MIN_MAX_INC;
+            }
+         }
          part { name: "button_image";
             type: RECT;
             scale: 1;
@@ -5897,9 +5906,8 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             mouse_events: 0;
             clip_to: "clear_button.clipper";
             description { state: "default" 0.0;
-               min: BUTTON_EDITFIELD_CLEAR_BUTTON_MIN_MAX_INC;
-               max: BUTTON_EDITFIELD_CLEAR_BUTTON_MIN_MAX_INC;
-               fixed: 1 1;
+               min: BUTTON_EDITFIELD_CLEAR_BUTTON_IMAGE_MIN_MAX_INC;
+               max: BUTTON_EDITFIELD_CLEAR_BUTTON_IMAGE_MIN_MAX_INC;
                align: 0.5 0.5;
                image.normal: "00_edit_field_clear.png";
             }
@@ -6088,14 +6096,22 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus_bottom", "00_list_group_bg_bottom_focus.png")
          image: "00_field_btn_clear.png" COMP;
       }
       parts {
-         part { name: "clear_button";
+         part { name: "bg";
+            type: SPACER;
             scale: 1;
             mouse_events: 0;
-            clip_to: "clear_button.clipper";
             description { state: "default" 0.0;
                min: BUTTON_SEARCH_CLEAR_BUTTON_MIN_MAX_INC;
                max: BUTTON_SEARCH_CLEAR_BUTTON_MIN_MAX_INC;
-               fixed: 1 1;
+            }
+         }
+         part { name: "clear_button";
+            scale: 1;
+            mouse_events: 0;
+            clip_to: "clear_button.clipper";
+            description { state: "default" 0.0;
+               min: BUTTON_SEARCH_CLEAR_BUTTON_IMAGE_MIN_MAX_INC;
+               max: BUTTON_SEARCH_CLEAR_BUTTON_IMAGE_MIN_MAX_INC;
                align: 0.5 0.5;
                image.normal: "00_field_btn_clear.png";
             }

diff --git a/themes/widgets/entry.edc b/themes/widgets/entry.edc
index 720472d..0fc6f4d 100644 (file)
--- 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";

diff --git a/themes/widgets/popup.edc b/themes/widgets/popup.edc
index 739099a..8138b25 100644 (file)
--- a/themes/widgets/popup.edc
+++ b/themes/widgets/popup.edc
@@ -1777,6 +1777,7 @@ group { name: "elm/popup/content/min_menustyle";
          scale: 1;
          description { state: "default" 0.0;
             min: POPUP_CONTENT_MINSTYLE_CONTENT_DEFAULT_MIN_INC;
+            max: POPUP_CONTENT_MINSTYLE_CONTENT_DEFAULT_MIN_INC;
             align: 0.5 0.5;
             fixed: 1 0;
             rel1 {
@@ -1874,6 +1875,7 @@ group { name: "elm/popup/content/min_liststyle";
          scale: 1;
          description { state: "default" 0.0;
             min: POPUP_CONTENT_MINSTYLE_CONTENT_DEFAULT_MIN_INC;
+            max: POPUP_CONTENT_MINSTYLE_CONTENT_DEFAULT_MIN_INC;
             align: 0.5 0.5;
             fixed: 1 0;
             rel1 {