Button default style refactoring for nbeat HD styles.

Change-Id: I4b58eaffe8700821895a3a6ee017d09051a66937

diff --git a/themes/groups/button.edc b/themes/groups/button.edc
index d657399..78ce9ef 100644 (file)
--- a/themes/groups/button.edc
+++ b/themes/groups/button.edc
@@ -3408,10 +3408,10 @@
          part { name: "button_image";
             scale: 1;
             description { state: "default" 0.0;
-               min: 16 38;
+               min: BUTTON_DEFAULT_STYLE_BG_MIN_INC;
                image {
                   normal: "00_button_01_normal.png";
-                  border: 4 4 3 3;
+                  border: BUTTON_DEFAULT_STYLE_BG_BORDER_INC;
                   border_scale: 1;
                }
             }
@@ -3443,7 +3443,7 @@
                rel2 {
                   relative: 0.0 0.0;
                }
-               min: 2 2;
+               min: BUTTON_SWEEP_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
@@ -3457,7 +3457,7 @@
                rel1 {
                   relative: 1.0 1.0;
                }
-               min: 2 2;
+               min: BUTTON_DEFAULT_STYLE_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
@@ -3468,6 +3468,7 @@
             mouse_events: 0;
             description { state: "default" 0.0; //when only icon or no icon is there
                align: 0.0 0.0;
+               visible: 0;
                rel1 {
                   relative: 1.0 0.0;
                   to: "elm.swallow.content";
@@ -3477,22 +3478,14 @@
                }
                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
-               align: 0.0 0.0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to: "elm.swallow.content";
-               }
-               rel2 {
-                  to: "elm.swallow.content";
-               }
-               fixed: 1 0;
-               min: 5 0;
+               inherit: "default" 0.0;
+               visible: 1;
+               min: BUTTON_DEFAULT_STYLE_PADDING_ICON_TEXT_VISIBLE_MIN_INC;
                color: 0 0 0 0;
             }
          }
@@ -3530,17 +3523,16 @@
                aspect_preference: VERTICAL;
             }
             description { state: "icononly" 0.0;
-               min: 38 38;
+               min: BUTTON_DEFAULT_STYLE_ICONONLY_ICON_MIN_INC;
                rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "padding_left_top";
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
                }
                rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "padding_right_bottom";
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
                }
-               aspect: 1.0 1.0;
-               aspect_preference: VERTICAL;
             }
          }
          part { name: "elm.text";
@@ -3557,41 +3549,40 @@
                }
                rel2 {
                   relative: 0.0 0.0;
-                  to:"padding_right_bottom";
+                  to: "padding_right_bottom";
                }
-               color: BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC;
+               color: BUTTON_DEFAULT_STYLE_BUTTON_TEXT_NORMAL_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
-                  size: 24;
+                  size: BUTTON_DEFAULT_STYLE_FONT_SIZE_INC;
                   min: 0 0;
                }
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               min: 90 34;
+               min: BUTTON_DEFAULT_STYLE_TEXT_MIN_INC;
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                min: 0 0;
-               color: BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC;
+               color: BUTTON_DEFAULT_STYLE_BUTTON_TEXT_PRESSED_COLOR_INC;
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC;
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC;
+               color: BUTTON_DEFAULT_STYLE_BUTTON_TEXT_DISABLED_COLOR_INC;
                visible: 1;
-               min: 90 34;
+               min: BUTTON_DEFAULT_STYLE_TEXT_MIN_INC;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                min: 0 0;
-               color: BUTTON_TEXT_STYLE1_FOCUSED_COLOR_INC;
+               color: BUTTON_DEFAULT_STYLE_BUTTON_TEXT_FOCUSED_COLOR_INC;
             }
          }
          part { name: "over2";
@@ -3766,9 +3757,9 @@
                new Float:vl;
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "disabled_visible"))
-                  set_state(PART:"elm.text", "visible", 0.0);
+                 set_state(PART:"elm.text", "visible", 0.0);
                else
-                  set_state(PART:"elm.text", "default", 0.0);
+                 set_state(PART:"elm.text", "default", 0.0);
                set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }

diff --git a/themes/inc/nbeat-black-hd-inc.edc b/themes/inc/nbeat-black-hd-inc.edc
index 2a0d297..c316a86 100644 (file)
--- a/themes/inc/nbeat-black-hd-inc.edc
+++ b/themes/inc/nbeat-black-hd-inc.edc
@@ -375,6 +375,11 @@
 #define BUTTON_SWEEP_BUTTON_TEXT_FOCUSED_COLOR_INC 249 249 249 255
 #define BUTTON_SWEEP_BUTTON_TEXT_DISABLED_COLOR_INC 0 0 0 255
 
+#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_NORMAL_COLOR_INC 249 249 249 255
+#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_PRESSED_COLOR_INC 249 249 249 255
+#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_FOCUSED_COLOR_INC 249 249 249 255
+#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_DISABLED_COLOR_INC 108 115 118 255
+
 #define BUTTON_CONTACT_BUTTON_BG_NORMAL_COLOR_INC 42 109 140 255
 #define BUTTON_CONTACT_BUTTON_BG_PRESSED_COLOR_INC 64 182 237 255
 
@@ -543,6 +548,14 @@
 #define BUTTON_PICKER_BAR_DEFAULT_TEXT_FONT_SIZE_INC 32
 #define BUTTON_PICKER_BAR_DEFAULT_TEXT_VISIBLE_MIN_INC 128 56
 
+#define BUTTON_DEFAULT_STYLE_BG_MIN_INC 28 74
+#define BUTTON_DEFAULT_STYLE_BG_BORDER_INC 5 5 5 5
+#define BUTTON_DEFAULT_STYLE_PADDING_MIN_INC 5 5
+#define BUTTON_DEFAULT_STYLE_PADDING_ICON_TEXT_VISIBLE_MIN_INC 5 0
+#define BUTTON_DEFAULT_STYLE_ICONONLY_ICON_MIN_INC 38 38
+#define BUTTON_DEFAULT_STYLE_TEXT_MIN_INC 144 38
+#define BUTTON_DEFAULT_STYLE_FONT_SIZE_INC 32
+
 #define CHECK_DELETE_TEXT_DELETE_NORMAL_COLOR_INC 205 2 5 255
 #define CHECK_DELETE_TEXT_DELETE_PRESS_COLOR_INC 255 255 255 255
 

diff --git a/themes/inc/nbeat-black-inc.edc b/themes/inc/nbeat-black-inc.edc
index 36327ec..25cadf1 100644 (file)
--- a/themes/inc/nbeat-black-inc.edc
+++ b/themes/inc/nbeat-black-inc.edc
@@ -360,6 +360,11 @@
 #define BUTTON_SWEEP_BUTTON_TEXT_FOCUSED_COLOR_INC 249 249 249 255
 #define BUTTON_SWEEP_BUTTON_TEXT_DISABLED_COLOR_INC 0 0 0 255
 
+#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_NORMAL_COLOR_INC 249 249 249 255
+#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_PRESSED_COLOR_INC 249 249 249 255
+#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_FOCUSED_COLOR_INC 249 249 249 255
+#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_DISABLED_COLOR_INC 108 115 118 255
+
 #define BUTTON_CONTACT_BUTTON_BG_NORMAL_COLOR_INC 42 109 140 255
 #define BUTTON_CONTACT_BUTTON_BG_PRESSED_COLOR_INC 64 182 237 255
 
@@ -528,6 +533,14 @@
 #define BUTTON_PICKER_BAR_DEFAULT_TEXT_FONT_SIZE_INC 20
 #define BUTTON_PICKER_BAR_DEFAULT_TEXT_VISIBLE_MIN_INC 80 32
 
+#define BUTTON_DEFAULT_STYLE_BG_MIN_INC 18 46
+#define BUTTON_DEFAULT_STYLE_BG_BORDER_INC 4 4 3 3
+#define BUTTON_DEFAULT_STYLE_PADDING_MIN_INC 5 5
+#define BUTTON_DEFAULT_STYLE_PADDING_ICON_TEXT_VISIBLE_MIN_INC 5 0
+#define BUTTON_DEFAULT_STYLE_ICONONLY_ICON_MIN_INC 30 30
+#define BUTTON_DEFAULT_STYLE_TEXT_MIN_INC 90 30
+#define BUTTON_DEFAULT_STYLE_FONT_SIZE_INC 20
+
 #define CHECK_DELETE_TEXT_DELETE_NORMAL_COLOR_INC 205 2 5 255
 #define CHECK_DELETE_TEXT_DELETE_PRESS_COLOR_INC 255 255 255 255
 

diff --git a/themes/inc/nbeat-hd-inc.edc b/themes/inc/nbeat-hd-inc.edc
index b0aee5f..f09b30f 100644 (file)
--- a/themes/inc/nbeat-hd-inc.edc
+++ b/themes/inc/nbeat-hd-inc.edc
@@ -389,6 +389,11 @@
 #define BUTTON_SWEEP_BUTTON_TEXT_FOCUSED_COLOR_INC 255 255 255 255
 #define BUTTON_SWEEP_BUTTON_TEXT_DISABLED_COLOR_INC 0 0 0 128
 
+#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_NORMAL_COLOR_INC 78 73 69 255
+#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_PRESSED_COLOR_INC 255 255 255 255
+#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_FOCUSED_COLOR_INC 255 255 255 255
+#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_DISABLED_COLOR_INC 185 185 185 255
+
 #define BUTTON_CONTACT_BUTTON_BG_NORMAL_COLOR_INC 195 160 107 255
 #define BUTTON_CONTACT_BUTTON_BG_PRESSED_COLOR_INC 103 79 43 255
 
@@ -557,6 +562,14 @@
 #define BUTTON_PICKER_BAR_DEFAULT_TEXT_FONT_SIZE_INC 32
 #define BUTTON_PICKER_BAR_DEFAULT_TEXT_VISIBLE_MIN_INC 128 56
 
+#define BUTTON_DEFAULT_STYLE_BG_MIN_INC 28 74
+#define BUTTON_DEFAULT_STYLE_BG_BORDER_INC 5 5 5 5
+#define BUTTON_DEFAULT_STYLE_PADDING_MIN_INC 5 5
+#define BUTTON_DEFAULT_STYLE_PADDING_ICON_TEXT_VISIBLE_MIN_INC 5 0
+#define BUTTON_DEFAULT_STYLE_ICONONLY_ICON_MIN_INC 38 38
+#define BUTTON_DEFAULT_STYLE_TEXT_MIN_INC 144 38
+#define BUTTON_DEFAULT_STYLE_FONT_SIZE_INC 32
+
 #define CHECK_DELETE_TEXT_DELETE_NORMAL_COLOR_INC 207 41 41 255
 #define CHECK_DELETE_TEXT_DELETE_PRESS_COLOR_INC 255 255 255 255
 

diff --git a/themes/inc/nbeat-inc.edc b/themes/inc/nbeat-inc.edc
index 80d1cbd..bc57668 100644 (file)
--- a/themes/inc/nbeat-inc.edc
+++ b/themes/inc/nbeat-inc.edc
@@ -382,6 +382,11 @@
 #define BUTTON_SWEEP_BUTTON_TEXT_FOCUSED_COLOR_INC 255 255 255 255
 #define BUTTON_SWEEP_BUTTON_TEXT_DISABLED_COLOR_INC 0 0 0 128
 
+#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_NORMAL_COLOR_INC 78 73 69 255
+#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_PRESSED_COLOR_INC 255 255 255 255
+#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_FOCUSED_COLOR_INC 255 255 255 255
+#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_DISABLED_COLOR_INC 185 185 185 255
+
 #define BUTTON_CONTACT_BUTTON_BG_NORMAL_COLOR_INC 195 160 107 255
 #define BUTTON_CONTACT_BUTTON_BG_PRESSED_COLOR_INC 103 79 43 255
 
@@ -550,6 +555,14 @@
 #define BUTTON_PICKER_BAR_DEFAULT_TEXT_FONT_SIZE_INC 20
 #define BUTTON_PICKER_BAR_DEFAULT_TEXT_VISIBLE_MIN_INC 80 32
 
+#define BUTTON_DEFAULT_STYLE_BG_MIN_INC 18 46
+#define BUTTON_DEFAULT_STYLE_BG_BORDER_INC 4 4 3 3
+#define BUTTON_DEFAULT_STYLE_PADDING_MIN_INC 5 5
+#define BUTTON_DEFAULT_STYLE_PADDING_ICON_TEXT_VISIBLE_MIN_INC 5 0
+#define BUTTON_DEFAULT_STYLE_ICONONLY_ICON_MIN_INC 30 30
+#define BUTTON_DEFAULT_STYLE_TEXT_MIN_INC 90 30
+#define BUTTON_DEFAULT_STYLE_FONT_SIZE_INC 20
+
 #define CHECK_DELETE_TEXT_DELETE_NORMAL_COLOR_INC 207 41 41 255
 #define CHECK_DELETE_TEXT_DELETE_PRESS_COLOR_INC 255 255 255 255