[entry] Changed editfield, searchbar theme according to UX v1.6

diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc
index 43147c5..ccfc7c8 100755 (executable)
--- a/themes/inc/tizen-dark-inc.edc
+++ b/themes/inc/tizen-dark-inc.edc
@@ -820,21 +820,14 @@
 #define SEARCHBAR_CANCEL_BUTTON_W_INC 136
 #define SEARCHBAR_CANCEL_BUTTON_WITH_DOUBLE_PADDING_W_INC 166
 #define SEARCHBAR_CANCEL_BUTTON_LEFT_PADDING_INC 10
-#define SEARCHBAR_TOP_PADDING_INC 10
-#define SEARCHBAR_BOTTOM_PADDING_INC 10
+#define SEARCHBAR_TOP_PADDING_INC 17
+#define SEARCHBAR_BOTTOM_PADDING_INC 16
+#define SEARCHBAR_BASE_HEIGHT_INC 99
 #define SEARCHBAR_HEIGHT_INC 66
 #define SEARCHBAR_WIDTH_INC 120
 #define SEARCHBAR_LEFT_PADDING_INC 16
 #define SEARCHBAR_RIGHT_PADDING_INC 16
-#define SEARCHBAR_INPUTFIELD_BORDER_INC 12 13 12 13
-#define SEARCHBAR_LEFT_ICON_PADDING_INC 0
-#define SEARCHBAR_ICON_MIN_W_INC 44
-#define SEARCHBAR_ICON_MIN_H_INC 44
-#define SEARCHBAR_LEFT_PADDING_SEARCHFIELD_INC 9
-#define SEARCHBAR_RIGHT_PADDING_SEARCHFIELD_INC 8
-#define SEARCHBAR_SEARCH_TEXTFIELD_H_INC 60
-#define SEARCHBAR_H_INC 86
-#define SEARCHBAR_ICON_COLOR_INC 135 133 128 255
+#define SEARCHBAR_H_INC 99
 
 #define SELECTION_INFO_BACKGROUND_COLOR_INC          43 58 175 255
 #define SELECTION_INFO_TEXT_COLOR_INC                250 250 250 255
@@ -998,8 +991,9 @@
 
 #define ENTRY_EDITFIELD_SEARCHBAR_TEXT_SIZE_INC 36
 #define ENTRY_EDITFIELD_SEARCHBAR_TEXT_COLOR_INC "#FAFAFA"
-#define ENTRY_EDITFIELD_SEARCHBAR_DISABLED_TEXT_COLOR_INC "#5D617699"
+#define ENTRY_EDITFIELD_SEARCHBAR_DISABLED_TEXT_COLOR_INC "#969696"
 #define ENTRY_EDITFIELD_SEARCHBAR_GUIDE_TEXT_COLOR_INC "#5D6176"
+#define ENTRY_EDITFIELD_SEARCHBAR_DISABLED_GUIDE_TEXT_COLOR_INC "#969696"
 
 #define ENTRY_FONT_COLOR_BLACK_TEXT_COLOR_INC "#000000"
 #define ENTRY_FONT_COLOR_BLACK_DISABLED_TEXT_COLOR_INC "#00000080"
@@ -1064,9 +1058,9 @@
 
 #define ENTRY_SEARCH_ICON_MIN_MAX_INC 45 45
 #define ENTRY_SEARCH_ICON_CLIPPER_DEFAULT_COLOR_INC 93 97 118 255
-#define ENTRY_SEARCH_ICON_CLIPPER_DISABLED_COLOR_INC 93 97 118 128
-#define ENTRY_SEARCH_ICON_LEFT_PADDING_MIN_MAX_INC 6 6
-#define ENTRY_SEARCH_ICON_RIGHT_PADDING_MIN_MAX_INC 16 16
+#define ENTRY_SEARCH_ICON_CLIPPER_DISABLED_COLOR_INC 56 58 71 255
+#define ENTRY_SEARCH_ICON_LEFT_PADDING_MIN_MAX_INC 6 0
+#define ENTRY_SEARCH_ICON_RIGHT_PADDING_MIN_MAX_INC 16 0
 
 #define SLIDER_INDICATOR_TEXT_COLOR_INC      250 250 250 255
 #define SLIDER_INDICATOR_TEXT_PRESSED_COLOR_INC      250 250 250 255

diff --git a/themes/inc/tizen-light-inc.edc b/themes/inc/tizen-light-inc.edc
index f7df871..e7af3fd 100755 (executable)
--- a/themes/inc/tizen-light-inc.edc
+++ b/themes/inc/tizen-light-inc.edc
@@ -821,21 +821,14 @@
 #define SEARCHBAR_CANCEL_BUTTON_W_INC 136
 #define SEARCHBAR_CANCEL_BUTTON_WITH_DOUBLE_PADDING_W_INC 166
 #define SEARCHBAR_CANCEL_BUTTON_LEFT_PADDING_INC 10
-#define SEARCHBAR_TOP_PADDING_INC 10
-#define SEARCHBAR_BOTTOM_PADDING_INC 10
+#define SEARCHBAR_TOP_PADDING_INC 17
+#define SEARCHBAR_BOTTOM_PADDING_INC 16
+#define SEARCHBAR_BASE_HEIGHT_INC 99
 #define SEARCHBAR_HEIGHT_INC 66
 #define SEARCHBAR_WIDTH_INC 120
 #define SEARCHBAR_LEFT_PADDING_INC 16
 #define SEARCHBAR_RIGHT_PADDING_INC 16
-#define SEARCHBAR_INPUTFIELD_BORDER_INC 12 13 12 13
-#define SEARCHBAR_LEFT_ICON_PADDING_INC 0
-#define SEARCHBAR_ICON_MIN_W_INC 44
-#define SEARCHBAR_ICON_MIN_H_INC 44
-#define SEARCHBAR_LEFT_PADDING_SEARCHFIELD_INC 9
-#define SEARCHBAR_RIGHT_PADDING_SEARCHFIELD_INC 8
-#define SEARCHBAR_SEARCH_TEXTFIELD_H_INC 60
-#define SEARCHBAR_H_INC 86
-#define SEARCHBAR_ICON_COLOR_INC 135 133 128 255
+#define SEARCHBAR_H_INC 99
 
 #define SELECTION_INFO_BACKGROUND_COLOR_INC          189 187 181 255
 #define SELECTION_INFO_TEXT_COLOR_INC                65 65 65 255
@@ -999,8 +992,9 @@
 
 #define ENTRY_EDITFIELD_SEARCHBAR_TEXT_SIZE_INC 36
 #define ENTRY_EDITFIELD_SEARCHBAR_TEXT_COLOR_INC "#000000"
-#define ENTRY_EDITFIELD_SEARCHBAR_DISABLED_TEXT_COLOR_INC "#87858080"
+#define ENTRY_EDITFIELD_SEARCHBAR_DISABLED_TEXT_COLOR_INC "#7F7F7F"
 #define ENTRY_EDITFIELD_SEARCHBAR_GUIDE_TEXT_COLOR_INC "#878580"
+#define ENTRY_EDITFIELD_SEARCHBAR_DISABLED_GUIDE_TEXT_COLOR_INC "#7F7F7F"
 
 #define ENTRY_FONT_COLOR_BLACK_TEXT_COLOR_INC "#000000"
 #define ENTRY_FONT_COLOR_BLACK_DISABLED_TEXT_COLOR_INC "#00000080"
@@ -1065,9 +1059,9 @@
 
 #define ENTRY_SEARCH_ICON_MIN_MAX_INC 45 45
 #define ENTRY_SEARCH_ICON_CLIPPER_DEFAULT_COLOR_INC 128 128 128 255
-#define ENTRY_SEARCH_ICON_CLIPPER_DISABLED_COLOR_INC 128 128 128 76
-#define ENTRY_SEARCH_ICON_LEFT_PADDING_MIN_MAX_INC 6 6
-#define ENTRY_SEARCH_ICON_RIGHT_PADDING_MIN_MAX_INC 16 16
+#define ENTRY_SEARCH_ICON_CLIPPER_DISABLED_COLOR_INC 191 191 191 255
+#define ENTRY_SEARCH_ICON_LEFT_PADDING_MIN_MAX_INC 6 0
+#define ENTRY_SEARCH_ICON_RIGHT_PADDING_MIN_MAX_INC 16 0
 
 #define SLIDER_INDICATOR_TEXT_COLOR_INC      59 115 182 255
 #define SLIDER_INDICATOR_TEXT_PRESSED_COLOR_INC      250 250 250 255

diff --git a/themes/widgets/entry.edc b/themes/widgets/entry.edc
index c461c34..9958a0b 100644 (file)
--- a/themes/widgets/entry.edc
+++ b/themes/widgets/entry.edc
@@ -716,7 +716,6 @@ group { name: "elm/entry/base/editfield";
             text {
                style: "editfield_textblock_guide_style";
                min: 0 1;
-               align: 0.0 0.0;
             }
          }
          description { state: "hidden" 0.0;
@@ -748,7 +747,6 @@ group { name: "elm/entry/base/editfield";
             text {
             style: "editfield_textblock_style";
                min: 0 1;
-               align: 0.0 0.0;
             }
             ENTRY_EDITFIELD_TEXTBLOCK_DEFAULT_REL
          }
@@ -875,7 +873,6 @@ group { name: "elm/entry/base-charwrap/editfield";
             text {
                style: "editfield_textblock_char_wrap_guide_style";
                min: 0 1;
-               align: 0.0 0.0;
             }
          }
          description { state: "hidden" 0.0;
@@ -907,7 +904,6 @@ group { name: "elm/entry/base-charwrap/editfield";
             text {
                style: "editfield_textblock_char_wrap_style";
                min: 0 1;
-               align: 0.0 0.0;
             }
             ENTRY_EDITFIELD_TEXTBLOCK_DEFAULT_REL
          }
@@ -1168,6 +1164,16 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
          tag:  "link" "+ color=#800 underline=on underline_color=#8008";
          tag:  "hilight" "+ font=Tizen:style=Bold";
       }
+      style { name: "editfield_searchbar_single_textblock_disabled_guide_style";
+         base: "font=Tizen:style=Roman font_size="ENTRY_EDITFIELD_SEARCHBAR_TEXT_SIZE_INC" color="ENTRY_EDITFIELD_SEARCHBAR_DISABLED_GUIDE_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=entry ellipsis=1.0";
+         tag:  "br" "\n";
+         tag:  "ps" "ps";
+         tag:  "tab" "\t";
+         tag:  "em" "+ font=Tizen:style=Oblique";
+         tag:  "b" "+ font=Tizen:style=Bold";
+         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
+         tag:  "hilight" "+ font=Tizen:style=Bold";
+      }
    }
    parts {
       part { name: "elm.guide";
@@ -1183,6 +1189,12 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
                max: 0 1;
             }
          }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "editfield_searchbar_single_textblock_disabled_guide_style";
+            }
+         }
          description { state: "hidden" 0.0;
             inherit: "default" 0.0;
             visible: 0;
@@ -1233,12 +1245,14 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
          source: "elm";
          action: STATE_SET "disabled" 0.0;
          target: "elm.text";
+         target: "elm.guide";
       }
       program { name: "enable";
          signal: "elm,state,enabled";
          source: "elm";
          action: STATE_SET "default" 0.0;
          target: "elm.text";
+         target: "elm.guide";
       }
       program { name: "gdisable";
          signal: "elm,guide,disabled";
@@ -6307,11 +6321,11 @@ group { name: "elm/scroller/entry/editfield/searchbar/default";
                fixed: 1 0;
                align: 0.0 0.5;
                rel1 {
-                  to_x: "icon_padding";
+                  to_x: "focus_left_padding";
                   relative: 1.0 0.0;
                }
                rel2 {
-                  to_x: "icon_padding";
+                  to_x: "focus_left_padding";
                   relative: 1.0 1.0;
                }
             }
@@ -6431,8 +6445,8 @@ group { name: "elm/scroller/entry/editfield/searchbar/default";
                }
             }
          }
-         part { name: "elm.swallow.content";
-            clip_to: "contentclipper";
+         part { name: "icon_padding";
+            type: SPACER;
             scale: 1;
             clip_to: "clipper";
             description { state: "default" 0.0;
@@ -6459,17 +6473,26 @@ group { name: "elm/scroller/entry/editfield/searchbar/default";
          }
          part { name: "elm.swallow.icon";
             type: SWALLOW;
+            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: "clear_padding";
+                  to_x: "search_icon_right_padding";
                   to_y: "bg";
-                  relative: 0.0 1.0;
+                  relative: 1.0 1.0;
                }
+               visible: 0;
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
             }
          }
       }

diff --git a/themes/widgets/layout.edc b/themes/widgets/layout.edc
index a1327c4..a0bdcd6 100644 (file)
--- a/themes/widgets/layout.edc
+++ b/themes/widgets/layout.edc
@@ -1153,6 +1153,7 @@ group { name: "elm/layout/searchbar/default";
          type: SPACER;
          scale: 1;
          description { state: "default" 0.0;
+            min: 0 SEARCHBAR_BASE_HEIGHT_INC;
             align: 0.0 0.0;
          }
       }
@@ -1199,7 +1200,7 @@ group { name: "elm/layout/searchbar/default";
          scale: 1;
          ignore_flags: ON_HOLD;
          description { state: "default" 0.0;
-            min: 0 40;
+            min: SEARCHBAR_WIDTH_INC SEARCHBAR_HEIGHT_INC;
             rel1 {
                relative : 0.0 0.0;
                to: "inputfield_rect";
@@ -1230,6 +1231,14 @@ group { name: "elm/layout/searchbar/default";
 
 group { name: "elm/layout/searchbar/cancel_button";
    parts {
+      part { name: "inputfield_base";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: 0 SEARCHBAR_BASE_HEIGHT_INC;
+            align: 0.0 0.0;
+         }
+      }
      part { name: "top_padding_rect";
          type: SPACER;
          scale: 1;
@@ -1237,6 +1246,8 @@ group { name: "elm/layout/searchbar/cancel_button";
             min: 0 SEARCHBAR_TOP_PADDING_INC;
             fixed: 0 1;
             align: 0 0;
+            rel1.to: "inputfield_base";
+            rel2.to: "inputfield_base";
             rel2.relative: 1.0 0.0;
          }
       }
@@ -1247,7 +1258,9 @@ group { name: "elm/layout/searchbar/cancel_button";
             min: 0 SEARCHBAR_BOTTOM_PADDING_INC;
             fixed: 0 1;
             align: 0 1;
+            rel1.to: "inputfield_base";
             rel1.relative: 0.0 1.0;
+            rel2.to: "inputfield_base";
          }
       }
       part { name: "base_bg";
@@ -1274,6 +1287,8 @@ group { name: "elm/layout/searchbar/cancel_button";
             min: SEARCHBAR_LEFT_PADDING_INC 0;
             fixed: 1 0;
             align: 0 0;
+            rel1.to: "inputfield_base";
+            rel2.to: "inputfield_base";
             rel2.relative: 0.0 1.0;
          }
       }
@@ -1284,11 +1299,9 @@ group { name: "elm/layout/searchbar/cancel_button";
             min: SEARCHBAR_RIGHT_PADDING_INC 0;
             fixed: 1 0;
             align: 1.0 0.0;
+            rel1.to: "inputfield_base";
             rel1.relative: 1.0 0.0;
-         }
-         description { state: "in" 0.0;
-            inherit: "default" 0.0;
-            min: SEARCHBAR_CANCEL_BUTTON_WITH_DOUBLE_PADDING_W_INC 0;
+            rel2.to: "inputfield_base";
          }
       }
       part { name: "inputfield_rect";
@@ -1304,7 +1317,7 @@ group { name: "elm/layout/searchbar/cancel_button";
             }
             rel2 {
                relative: 0.0 1.0;
-               to_x: "right_padding_rect";
+               to_x: "right_btn_padding_rect";
                to_y: "base_bg";
             }
             color: 0 0 0 0;
@@ -1314,17 +1327,19 @@ group { name: "elm/layout/searchbar/cancel_button";
          type: SPACER;
          scale: 1;
          description { state: "default" 0.0;
-            min: SEARCHBAR_RIGHT_PADDING_INC 0;
+            min: 0 0;
             fixed: 1 0;
-            align: 0.0 0.0;
-            rel1.relative: 1.0 0.0;
-            rel1.to: "inputfield_rect";
-            rel2.relative: 1.0 1.0;
-            rel2.to: "inputfield_rect";
+            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";
@@ -1334,16 +1349,16 @@ group { name: "elm/layout/searchbar/cancel_button";
          description { state: "default" 0.0;
             fixed: 1 1;
             min: SEARCHBAR_CANCEL_BUTTON_W_INC 0;
-            align: 0.0 0.5;
+            align: 1.0 0.5;
             state: "default" 0.0;
             rel1 {
-               relative: 1.0 1.0;
-               to_x: "right_btn_padding_rect";
+               relative: 0.0 1.0;
+               to_x: "right_padding_rect";
                to_y: "top_padding_rect";
             }
             rel2 {
-               relative: 1.0 0.0;
-               to_x: "right_btn_padding_rect";
+               relative: 0.0 0.0;
+               to_x: "right_padding_rect";
                to_y: "bottom_padding_rect";
             }
          }
@@ -1354,7 +1369,7 @@ group { name: "elm/layout/searchbar/cancel_button";
          scale: 1;
          ignore_flags: ON_HOLD;
          description { state: "default" 0.0;
-            min: 0 40;
+            min: SEARCHBAR_WIDTH_INC SEARCHBAR_HEIGHT_INC;
             rel1 {
                relative : 0.0 0.0;
                to: "inputfield_rect";
@@ -1384,7 +1399,6 @@ group { name: "elm/layout/searchbar/cancel_button";
          signal: "cancel,in";
          source: "";
          action: STATE_SET "in" 0.0;
-         target: "right_padding_rect";
          target: "right_btn_padding_rect";
          transition: LINEAR 0.3;
       }
@@ -1392,7 +1406,6 @@ group { name: "elm/layout/searchbar/cancel_button";
          signal: "cancel,out";
          source: "";
          action: STATE_SET "default" 0.0;
-         target: "right_padding_rect";
          target: "right_btn_padding_rect";
          transition: LINEAR 0.3;
       }
@@ -1400,14 +1413,12 @@ group { name: "elm/layout/searchbar/cancel_button";
          signal: "cancel,show";
          source: "";
          action: STATE_SET "in" 0.0;
-         target: "right_padding_rect";
          target: "right_btn_padding_rect";
       }
       program { name: "cancel_hide";
          signal: "cancel,hide";
          source: "";
          action: STATE_SET "default" 0.0;
-         target: "right_padding_rect";
          target: "right_btn_padding_rect";
       }
    }