[Searchbar & SegmentControl] Searchbar bg color added, indentation and Clean-up....

Change-Id: I105d70676b083f91f3be9a9b9b877b5a8007bff4

diff --git a/themes/groups/searchbar.edc b/themes/groups/searchbar.edc
index 41d0ae9..9747f1c 100644 (file)
--- a/themes/groups/searchbar.edc
+++ b/themes/groups/searchbar.edc
@@ -41,7 +41,7 @@ group {
             description{
                visible: 1;
                state: "default" 0.0;
-               min: 0 10;
+               min: 0 12;
                fixed: 0 1;
                align: 0 0;
                color: SEARCHBAR_BACKGROUND_COLOR_INC;
@@ -60,7 +60,7 @@ group {
             description{
                visible: 1;
                state: "default" 0.0;
-               min: 0 10;
+               min: 0 12;
                fixed: 0 1;
                align: 0 1;
                color: SEARCHBAR_BACKGROUND_COLOR_INC;
@@ -82,8 +82,14 @@ group {
                align: 0 0.5;
                fixed: 0 1;
                state: "default" 0.0;
-               rel1 { relative: 0.0 1.0; to: "top_padding_rect"; }
-               rel2 { relative: 1.0 0.0; to: "bottom_padding_rect"; }
+               rel1 {
+                  relative: 0.0 10/12;
+                  to: "top_padding_rect";
+               }
+               rel2 {
+                  relative: 1.0 1/6;
+                  to: "bottom_padding_rect";
+               }
                color: 0 0 0 0;
             }
          }
@@ -119,7 +125,6 @@ group {
             description{
                state: "default_without_bd" 0.0;
                inherit: "default" 0.0;
-               min: 0 0;
                visible: 0;
             }
          }
@@ -127,22 +132,34 @@ group {
             type: RECT;
             scale: 1;
             description{
-               visible: 0;
+               visible: 1;
                min: CANCEL_BUTTON_WITH_DOUBLE_PADDING_W 0;
                fixed: 1 0;
                align: 1 0;
                rel1.relative: 1.0 0.0;
+               color: SEARCHBAR_BACKGROUND_COLOR_INC;
+            }
+            description{
+               state: "default_without_bd" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
             }
          }
          part { name: "right_btn_padding_rect";
             type: RECT;
             scale: 1;
             description{
-               visible: 0;
+               visible: 1;
                min: CANCEL_BUTTON_WITH_PADDING_W 0;
                fixed: 1 0;
                align: 1 0;
                rel1.relative: 1.0 0.0;
+               color: SEARCHBAR_BACKGROUND_COLOR_INC;
+            }
+            description{
+               state: "default_without_bd" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
             }
          }
          part {   name: "inputfield_rect";
@@ -152,8 +169,16 @@ group {
                visible:1;
                state: "default" 0.0;
                align: 0.0 0.5;
-               rel1 { relative: 1.0 0.0; to_x: "left_padding_rect"; to_y: "base_bg"; }
-               rel2 { relative: 0.0 1.0; to_x: "right_padding_rect"; to_y: "base_bg"; }
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "left_padding_rect";
+                  to_y: "base_bg";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "right_padding_rect";
+                  to_y: "base_bg";
+               }
                image {
                   normal: "00_search_input_field_bg.png";
                   border: 3 3 3 3;
@@ -162,8 +187,16 @@ group {
             description {
                state: "in" 0.0;
                inherit: "default" 0.0;
-               rel1 { relative: 1.0 0.0; to_x: "left_padding_rect"; to_y: "base_bg"; }
-               rel2 { relative: 0.0 1.0; to_x: "right_field_and_btn_padding_rect"; to_y: "base_bg"; }
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "left_padding_rect";
+                  to_y: "base_bg";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "right_field_and_btn_padding_rect";
+                  to_y: "base_bg";
+               }
             }
          }
          part { name: "left_icon_padding_rect";
@@ -174,23 +207,33 @@ group {
                min: 10 0;
                fixed: 1 0;
                align: 0 0;
-               rel1 { to: "inputfield_rect"; };
-               rel2 { relative: 0.0 1.0; to: "inputfield_rect"; };
+               rel1 {
+                  to: "inputfield_rect";
+               };
+               rel2 {
+                  relative: 0.0 1.0;
+                  to: "inputfield_rect";
+               };
             }
          }
          part {   name: "search_icon";
             type: IMAGE;
             scale: 1;
             ignore_flags: ON_HOLD;
-            //mouse_events: 1;
             description {
                visible:1;
                min: 25 26;
                fixed: 1 1;
                align: 0 0.5;
                state: "default" 0.0;
-               rel1 { relative: 1.0 0.5; to_x: "left_icon_padding_rect"; }
-               rel2 { relative: 1.0 0.5; to_x: "left_icon_padding_rect"; }
+               rel1 {
+                  relative: 1.0 0.5;
+                  to_x: "left_icon_padding_rect";
+               }
+               rel2 {
+                  relative: 1.0 0.5;
+                  to_x: "left_icon_padding_rect";
+               }
                image {
                   normal: "00_search_icon.png";
                }
@@ -282,16 +325,32 @@ group {
                min: CANCEL_BUTTON_W 0;
                align: 0.0 0.5;
                state: "default" 0.0;
-               rel1 { relative: 1.0 1.0; to_x: "base_bg"; to_y: "top_padding_rect"; };
-               rel2 { relative: 1.0 0.0; to_x: "base_bg"; to_y: "bottom_padding_rect"; };
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "base_bg";
+                  to_y: "top_padding_rect";
+               };
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "base_bg";
+                  to_y: "bottom_padding_rect";
+               };
             }
             description {
                visible:1;
                state: "in" 0.0;
                min: CANCEL_BUTTON_W 0;
                align: 1.0 0.5;
-               rel1 { relative: 0.0 1.0; to_x: "right_btn_padding_rect"; to_y: "top_padding_rect"; };
-               rel2 { relative: 0.0 0.0; to_x: "right_padding_rect"; to_y: "bottom_padding_rect"; };
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_x: "right_btn_padding_rect";
+                  to_y: "top_padding_rect";
+               };
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "right_padding_rect";
+                  to_y: "bottom_padding_rect";
+               };
             }
          }
       }
@@ -338,6 +397,8 @@ group {
                   target: "bottom_padding_rect";
                   target: "right_padding_rect";
                   target: "left_padding_rect";
+                  target: "right_field_and_btn_padding_rect";
+                  target: "right_btn_padding_rect";
             }
             program {   name: "bd_hide";
                   signal: "BDHIDE";
@@ -347,6 +408,8 @@ group {
                   target: "bottom_padding_rect";
                   target: "right_padding_rect";
                   target: "left_padding_rect";
+                  target: "right_field_and_btn_padding_rect";
+                  target: "right_btn_padding_rect";
             }
             program {
                name:   "mouse_up";
@@ -405,12 +468,12 @@ group {
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
+               visible: 0;
                align: 0.0 0.0;
                rel1.relative: 0.0 0.0;
                rel2.relative: 0.0 1.0;
                min: 5 5;
                fixed: 1 0;
-               color: 0 0 0 0;
             }
          }
          part {
@@ -419,12 +482,12 @@ group {
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
+               visible: 0;
                align: 1.0 0.0;
                rel1.relative: 1.0 0.0;
                rel2.relative: 1.0 1.0;
                min: 5 5;
                fixed: 1 0;
-               color: 0 0 0 0;
             }
          }
          part {
@@ -433,12 +496,12 @@ group {
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
+               visible: 0;
                align: 0.0 0.0;
                rel1.relative: 0.0 0.0;
                rel2.relative: 1.0 0.0;
                min: 5 5;
                fixed: 0 1;
-               color: 0 0 0 0;
             }
          }
          part {
@@ -447,12 +510,12 @@ group {
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
+               visible: 0;
                align: 1.0 1.0;
                rel1.relative: 0.0 1.0;
                rel2.relative: 1.0 1.0;
                min: 5 5;
                fixed: 0 1;
-               color: 0 0 0 0;
             }
          }
          part {
@@ -461,13 +524,20 @@ group {
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
-               visible: 1;
+               visible: 0;
                min: 0 28;
                fixed: 1 0;
-               rel1 {relative: 0.0 1.0; to_x: "elm.swallow.content"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "elm.swallow.content"; to_y: "padding_bottom"; }
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.swallow.content";
+                  to_y: "padding_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.swallow.content";
+                  to_y: "padding_bottom";
+               }
                align: 0.0 0.5;
-               color: 0 0 0 0;
             }
          }
          part {
@@ -476,23 +546,29 @@ group {
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0; //when only icon or no icon is there
+               visible: 0;
                align: 0.0 0.0;
                rel1 { relative: 1.0 0.0; to: "icon_rect"; }
                rel2 { relative: 1.0 1.0; to: "icon_rect"; }
                fixed: 1 0;
                min: 0 0;
-               color: 0 0 0 0;
             }
             description { state: "icononly" 0.0;
                inherit: "default" 0.0;
             }
             description { state: "visible" 0.0; //when icon is visible
+               visible: 0;
                align: 0.0 0.0;
-               rel1 { relative: 1.0 0.0; to: "icon_rect"; }
-               rel2 { relative: 1.0 1.0; to: "icon_rect"; }
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "icon_rect";
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+                  to: "icon_rect";
+               }
                fixed: 1 0;
                min: 5 0;
-               color: 0 0 0 0;
             }
          }
          part { name: "elm.swallow.content";
@@ -501,25 +577,48 @@ group {
             description { state: "default" 0.0;
                visible: 0;
                align: 0.0 0.5;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "padding_left";
+                  to_y: "padding_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left";
+                  to_y: "padding_bottom";
+               }
                fixed: 1 0;
             }
             description { state: "visible" 0.0;
                fixed: 1 0;
                visible: 1;
                align: 0.0 0.5;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "padding_left";
+                  to_y: "padding_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left";
+                  to_y: "padding_bottom";
+               }
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
             }
             description { state: "icononly" 0.0;;
                visible: 1;
                min: 28 28;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
-               align: 0.5 0.5;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "padding_left";
+                  to_y: "padding_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "padding_right";
+                  to_y: "padding_bottom";
+               }
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
             }
@@ -530,15 +629,21 @@ group {
             scale: 1;
             description { state: "default" 0.0;
                visible: 0;
-               rel1 { relative: 1.0 1.0; to_x: "padding_icon_text"; to_y: "padding_top"; }
-               rel2 { relative: 0.0 0.0; to_x: "padding_right"; to_y:"padding_bottom"; }
-               align: 0.5 0.5;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "padding_icon_text";
+                  to_y: "padding_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "padding_right";
+                  to_y:"padding_bottom";
+               }
                color: BUTTON_SWEEP_BUTTON_TEXT_NORMAL_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
                   size: 20;
                   min:  0 0;
-                  align: 0.5 0.5;
                   max: 1 0;
                }
             }
@@ -784,81 +889,3 @@ group {
          }
       }
    }
-
-group {
-   name: "elm/entry/base/search_input";
-   styles
-   {
-      style {  name: "entry_search_textblock_style";
-         base: "font=SLP:style=Roman font_size=20 color=#828282 wrap=none";
-         tag:  "br" "\n";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font=SLP:style=Oblique";
-         tag:  "b" "+ font=SLP:style=Bold";
-         tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
-         tag:  "hilight" "+ font=SLP:style=Bold";
-      }
-
-      style { name: "entry_search_textblock_disabled_style";
-         base: "font=SLP:style=Roman font_size=20 color=#00000080 wrap=none";
-         tag:  "br" "\n";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font=SLP:style=Oblique";
-         tag:  "b" "+ font=SLP:style=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font=SLP:style=Bold";
-      }
-   }
-
-   parts {
-
-      part {   name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
-         entry_mode: EDITABLE;
-         select_mode: EXPLICIT;
-         //cursor_mode: BEFORE;
-         multiline: 0;
-         source: "elm/entry/selection/search_input"; // selection under
-         source4: "elm/entry/cursor/search_input"; // cursorover
-         source5: "elm/entry/anchor/search_input"; // anchor under
-         description {  state: "default" 0.0;
-               fixed: 1 0;
-               text {
-                  style: "entry_search_textblock_style";
-                  min: 0 1;
-               }
-         }
-         description {  state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               text {
-                  style: "entry_search_textblock_disabled_style";
-                  min: 0 1;
-               }
-         }
-      }
-   }
-   programs {
-      program {   name: "focus";
-            signal: "load";
-            source: "";
-            action: FOCUS_SET;
-            target: "elm.text";
-      }
-      program {   name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "elm.text";
-      }
-      program {   name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.text";
-      }
-   } // end program
-} // end group

diff --git a/themes/images/nbeat/00_winset_btn_sge_body_press_left.png b/themes/images/nbeat/00_winset_btn_sge_body_press_left.png
index cbc5d15..fb89cde 100644 (file)
Binary files a/themes/images/nbeat/00_winset_btn_sge_body_press_left.png and b/themes/images/nbeat/00_winset_btn_sge_body_press_left.png differ

diff --git a/themes/images/nbeat/00_winset_btn_sge_press_center.png b/themes/images/nbeat/00_winset_btn_sge_press_center.png
index 0bbb4d2..9eaa7ea 100644 (file)
Binary files a/themes/images/nbeat/00_winset_btn_sge_press_center.png and b/themes/images/nbeat/00_winset_btn_sge_press_center.png differ

diff --git a/themes/images/nbeat/00_winset_btn_sge_press_left.png b/themes/images/nbeat/00_winset_btn_sge_press_left.png
index dd37c78..da5563f 100644 (file)
Binary files a/themes/images/nbeat/00_winset_btn_sge_press_left.png and b/themes/images/nbeat/00_winset_btn_sge_press_left.png differ

diff --git a/themes/images/nbeat/00_winset_btn_sge_press_right.png b/themes/images/nbeat/00_winset_btn_sge_press_right.png
index 87ce1b8..6864c6b 100644 (file)
Binary files a/themes/images/nbeat/00_winset_btn_sge_press_right.png and b/themes/images/nbeat/00_winset_btn_sge_press_right.png differ

diff --git a/themes/inc/nbeat-black-inc.edc b/themes/inc/nbeat-black-inc.edc
index 0159f39..cf4222c 100755 (executable)
--- a/themes/inc/nbeat-black-inc.edc
+++ b/themes/inc/nbeat-black-inc.edc
@@ -251,7 +251,7 @@
 #define MULTIBUTTONENTRY_PRESSED_BUTTON_COLOR_INC 64 182 237 255
 #define MULTIBUTTONENTRY_LABEL_TEXT_COLOR_INC 249 249 249 255
 
-#define SEARCHBAR_BACKGROUND_COLOR_INC          0 0 0 0
+#define SEARCHBAR_BACKGROUND_COLOR_INC          36 36 36 255
 
 #define SELECTION_INFO_BACKGROUND_COLOR_INC          52 74 85 255
 #define SELECTION_INFO_TEXT_COLOR_INC          249 249 249 255

diff --git a/themes/inc/nbeat-inc.edc b/themes/inc/nbeat-inc.edc
index 4c7a404..ca9e65d 100755 (executable)
--- a/themes/inc/nbeat-inc.edc
+++ b/themes/inc/nbeat-inc.edc
@@ -275,7 +275,7 @@
 #define MULTIBUTTONENTRY_PRESSED_BUTTON_COLOR_INC 103 79 43 255
 #define MULTIBUTTONENTRY_LABEL_TEXT_COLOR_INC 0 0 0 255
 
-#define SEARCHBAR_BACKGROUND_COLOR_INC          0 0 0 0
+#define SEARCHBAR_BACKGROUND_COLOR_INC          242 238 233 255
 
 #define SELECTION_INFO_BACKGROUND_COLOR_INC          217 147 26 255
 #define SELECTION_INFO_TEXT_COLOR_INC          255 255 255 255