Updated Navigationbar's control button for nbeat-hd theme and fixed the disabled...

Change-Id: Ibee3217c7e00480d6a8370d584194ddbf01a053b

diff --git a/themes/groups/button.edc b/themes/groups/button.edc
index c1938d0..8342e55 100644 (file)
--- a/themes/groups/button.edc
+++ b/themes/groups/button.edc
@@ -1301,7 +1301,7 @@
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
-               align: 1.0 1.0; 
+               align: 1.0 1.0;
                rel1.relative: 0.0 1.0;
                rel2.relative: 1.0 1.0;
                min: 2 2;
@@ -7317,12 +7317,12 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               min: 20 20;
+               min: BUTTON_NAVIBAR_CENTER_BG_NORMAL_MIN_W_INC BUTTON_NAVIBAR_CENTER_BG_NORMAL_MIN_H_INC;
                color: 0 0 0 0;
                rel1.offset: 0 0;
                rel2.offset: -1 -1;
                image.normal: "00_Option_header_bt.png";
-               image.border: 4 4 4 4;
+               image.border: BUTTON_NAVIBAR_CENTER_BG_NORMAL_BORDER_INC;
                color: 255 255 255 255;
             }
             description { state: "disabled" 0.0;
@@ -7343,7 +7343,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                align: 0.0 0.0;
                rel1.relative: 0.0 0.0;
                rel2.relative: 0.0 0.0;
-               min: 10 5;
+               min: BUTTON_NAVIBAR_CENTER_PADDING_MIN_MAX_INC;
                fixed: 1 1;
                visible: 0;
             }
@@ -7357,7 +7357,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                align: 1.0 1.0;
                rel1.relative: 1.0 1.0;
                rel2.relative: 1.0 1.0;
-               min: 10 5;
+               min: BUTTON_NAVIBAR_CENTER_PADDING_MIN_MAX_INC;
                fixed: 1 1;
                visible: 0;
             }
@@ -7378,7 +7378,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             }
             description { state: "visible" 0.0;
                visible: 1;
-               min: 22 22;
+               min: BUTTON_NAVIBAR_CENTER_ICON_RECT_VISIBLE_MIN_SIZE;
                fixed: 1 0;
                rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
                rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
@@ -7408,7 +7408,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                rel1 { relative: 1.0 0.0; to: "icon_rect"; }
                rel2 { relative: 1.0 1.0; to: "icon_rect"; }
                fixed: 1 0;
-               min: 6 0;
+               min: BUTTON_NAVIBAR_CENTER_PADDING_AFTER_ICON_VISIBLE_MIN_INC;
                color: 0 0 0 0;
             }
             description { state: "icononly" 0.0;
@@ -7425,14 +7425,14 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                rel1 { relative: 0.0 1.0; to_x: "elm.text"; to_y: "padding_left_top"; }
                rel2 { relative: 0.0 0.0; to_x: "elm.text"; to_y: "padding_right_bottom"; }
                fixed: 1 0;
-               min: 6 0;
+               min: BUTTON_NAVIBAR_CENTER_PADDING_BEFORE_TEXT_DEFAULT_MIN_INC;
                color: 0 0 0 0;
             }
          }
          part { name: "elm.swallow.content";
             type: SWALLOW;
             scale: 1;
-            clip_to: "disabler";
+            clip_to: "clipper";
             description { state: "default" 0.0;
                visible: 0;
                align: 0.0 0.5;
@@ -7443,8 +7443,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             description { state: "visible" 0.0;
                fixed: 1 0;
                visible: 1;
-               min: 22 22;
-               max: 22 22;
+               min: BUTTON_NAVIBAR_CENTER_SWALLOW_VISIBLE_MIN_MAX_INC;
+               max: BUTTON_NAVIBAR_CENTER_SWALLOW_VISIBLE_MIN_MAX_INC;
                align: 1.0 0.5;
                rel1 { relative: 0.0 1.0; to_x: "padding_before_text"; to_y: "padding_left_top"; }
                rel2 { relative: 0.0 0.0; to_x: "padding_before_text"; to_y: "padding_right_bottom"; }
@@ -7453,8 +7453,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             }
             description { state: "icononly" 0.0;
                visible: 1;
-               min: 30 30;
-               max: 30 30;
+               min: BUTTON_NAVIBAR_CENTER_SWALLOW_ICONONLY_MIN_MAX_INC;
+               max: BUTTON_NAVIBAR_CENTER_SWALLOW_ICONONLY_MIN_MAX_INC;
                rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
                rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; }
                align: 0.5 0.5;
@@ -7466,7 +7466,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             type: TEXT;
             mouse_events:  0;
             scale: 1;
-            clip_to: "disabler";
+            clip_to: "clipper";
             description { state: "default" 0.0;
                visible: 0;
                rel1 { relative: 1.0 1.0; to_x: "padding_after_icon"; to_y: "padding_left_top"; }
@@ -7475,7 +7475,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                color: 255 255 255 255;
                text {
                   font: "SLP:style=Medium";
-                  size: 20;
+                  size: BUTTON_NAVIBAR_CENTER_TEXT_FONT_SIZE_INC;
                   min:  0 0;
                   align: 0.5 0.5;
                   max: 1 0;
@@ -7514,7 +7514,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                color: 0 0 0 0;
             }
          }
-         part { name: "disabler";
+         part { name: "clipper";
             type: RECT;
             description { state: "default" 0.0;
                color: 255 255 255 255;
@@ -7523,6 +7523,17 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                color: 255 255 255 127;
             }
          }
+         part { name: "disabler";
+            type: RECT;
+            description { state: "default" 0.0;
+               color: 0 0 0 0;
+               visible: 0;
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
       }
       programs {
          program { name: "button_click";
@@ -7634,6 +7645,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             source: "elm";
             action: STATE_SET "disabled" 0.0;
             target: "button_image";
+            target: "clipper";
             target: "disabler";
             after: "disable_text";
          }
@@ -7648,6 +7660,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "button_image";
+            target: "clipper";
             target: "disabler";
             after: "enable_text";
          }
@@ -7688,12 +7701,12 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               min: 20 20;
+               min: BUTTON_NAVIBAR_LEFT_BG_NORMAL_MIN_W_INC BUTTON_NAVIBAR_LEFT_BG_NORMAL_MIN_H_INC;
                color: 0 0 0 0;
                rel1.offset: 0 0;
                rel2.offset: -1 -1;
                image.normal: "00_Option_header_bt.png";
-               image.border: 4 4 4 4;
+               image.border: BUTTON_NAVIBAR_LEFT_BG_NORMAL_BORDER_INC;
                color: 255 255 255 255;
             }
             description { state: "disabled" 0.0;
@@ -7714,7 +7727,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                align: 0.0 0.0;
                rel1.relative: 0.0 0.0;
                rel2.relative: 0.0 0.0;
-               min: 10 5;
+               min: BUTTON_NAVIBAR_LEFT_PADDING_MIN_MAX_INC;
                fixed: 1 1;
                visible: 0;
             }
@@ -7728,7 +7741,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                align: 1.0 1.0;
                rel1.relative: 1.0 1.0;
                rel2.relative: 1.0 1.0;
-               min: 10 5;
+               min: BUTTON_NAVIBAR_LEFT_PADDING_MIN_MAX_INC;
                fixed: 1 1;
                visible: 0;
             }
@@ -7749,7 +7762,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             }
             description { state: "visible" 0.0;
                visible: 1;
-               min: 22 22;
+               min: BUTTON_NAVIBAR_LEFT_ICON_RECT_VISIBLE_MIN_SIZE;
                fixed: 1 0;
                rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
                rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
@@ -7779,7 +7792,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                rel1 { relative: 1.0 0.0; to: "icon_rect"; }
                rel2 { relative: 1.0 1.0; to: "icon_rect"; }
                fixed: 1 0;
-               min: 6 0;
+               min: BUTTON_NAVIBAR_LEFT_PADDING_AFTER_ICON_VISIBLE_MIN_INC;
                color: 0 0 0 0;
             }
             description { state: "icononly" 0.0;
@@ -7796,14 +7809,14 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                rel1 { relative: 0.0 1.0; to_x: "elm.text"; to_y: "padding_left_top"; }
                rel2 { relative: 0.0 0.0; to_x: "elm.text"; to_y: "padding_right_bottom"; }
                fixed: 1 0;
-               min: 6 0;
+               min: BUTTON_NAVIBAR_LEFT_PADDING_BEFORE_TEXT_DEFAULT_MIN_INC;
                color: 0 0 0 0;
             }
          }
          part { name: "elm.swallow.content";
             type: SWALLOW;
             scale: 1;
-            clip_to: "disabler";
+            clip_to: "clipper";
             description { state: "default" 0.0;
                visible: 0;
                align: 0.0 0.5;
@@ -7814,8 +7827,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             description { state: "visible" 0.0;
                fixed: 1 0;
                visible: 1;
-               min: 22 22;
-               max: 22 22;
+               min: BUTTON_NAVIBAR_LEFT_SWALLOW_VISIBLE_MIN_MAX_INC;
+               max: BUTTON_NAVIBAR_LEFT_SWALLOW_VISIBLE_MIN_MAX_INC;
                align: 1.0 0.5;
                rel1 { relative: 0.0 1.0; to_x: "padding_before_text"; to_y: "padding_left_top"; }
                rel2 { relative: 0.0 0.0; to_x: "padding_before_text"; to_y: "padding_right_bottom"; }
@@ -7824,8 +7837,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             }
             description { state: "icononly" 0.0;
                visible: 1;
-               min: 30 30;
-               max: 30 30;
+               min: BUTTON_NAVIBAR_LEFT_SWALLOW_ICONONLY_MIN_MAX_INC;
+               max: BUTTON_NAVIBAR_LEFT_SWALLOW_ICONONLY_MIN_MAX_INC;
                rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
                rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; }
                align: 0.5 0.5;
@@ -7837,7 +7850,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             type: TEXT;
             mouse_events:  0;
             scale: 1;
-            clip_to: "disabler";
+            clip_to: "clipper";
             description { state: "default" 0.0;
                visible: 0;
                rel1 { relative: 1.0 1.0; to_x: "padding_after_icon"; to_y: "padding_left_top"; }
@@ -7846,7 +7859,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                color: 255 255 255 255;
                text {
                   font: "SLP:style=Medium";
-                  size: 20;
+                  size: BUTTON_NAVIBAR_LEFT_TEXT_FONT_SIZE_INC;
                   min:  0 0;
                   align: 0.0 0.5;
                   max: 1 0;
@@ -7885,7 +7898,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                color: 0 0 0 0;
             }
          }
-         part { name: "disabler";
+         part { name: "clipper";
             type: RECT;
             description { state: "default" 0.0;
                color: 255 255 255 255;
@@ -7894,6 +7907,17 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                color: 255 255 255 127;
             }
          }
+         part { name: "disabler";
+            type: RECT;
+            description { state: "default" 0.0;
+               color: 0 0 0 0;
+               visible: 0;
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
       }
       programs {
          program { name: "button_click";
@@ -8005,6 +8029,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             source: "elm";
             action: STATE_SET "disabled" 0.0;
             target: "button_image";
+            target: "clipper";
             target: "disabler";
             after: "disable_text";
          }
@@ -8019,6 +8044,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "button_image";
+            target: "clipper";
             target: "disabler";
             after: "enable_text";
          }
@@ -8059,12 +8085,12 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               min: 20 20;
+               min: BUTTON_NAVIBAR_RIGHT_BG_NORMAL_MIN_W_INC BUTTON_NAVIBAR_RIGHT_BG_NORMAL_MIN_H_INC;
                color: 0 0 0 0;
                rel1.offset: 0 0;
                rel2.offset: -1 -1;
                image.normal: "00_Option_header_bt.png";
-               image.border: 4 4 4 4;
+               image.border: BUTTON_NAVIBAR_RIGHT_BG_NORMAL_BORDER_INC;
                color: 255 255 255 255;
             }
             description { state: "disabled" 0.0;
@@ -8085,7 +8111,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                align: 0.0 0.0;
                rel1.relative: 0.0 0.0;
                rel2.relative: 0.0 0.0;
-               min: 10 5;
+               min: BUTTON_NAVIBAR_RIGHT_PADDING_MIN_MAX_INC;
                fixed: 1 1;
                visible: 0;
             }
@@ -8099,7 +8125,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                align: 1.0 1.0;
                rel1.relative: 1.0 1.0;
                rel2.relative: 1.0 1.0;
-               min: 10 5;
+               min: BUTTON_NAVIBAR_RIGHT_PADDING_MIN_MAX_INC;
                fixed: 1 1;
                visible: 0;
             }
@@ -8120,7 +8146,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             }
             description { state: "visible" 0.0;
                visible: 1;
-               min: 22 22;
+               min: BUTTON_NAVIBAR_RIGHT_ICON_RECT_VISIBLE_MIN_SIZE;
                fixed: 1 0;
                rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
                rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
@@ -8150,7 +8176,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                rel1 { relative: 1.0 0.0; to: "icon_rect"; }
                rel2 { relative: 1.0 1.0; to: "icon_rect"; }
                fixed: 1 0;
-               min: 6 0;
+               min: BUTTON_NAVIBAR_RIGHT_PADDING_AFTER_ICON_VISIBLE_MIN_INC;
                color: 0 0 0 0;
             }
             description { state: "icononly" 0.0;
@@ -8167,14 +8193,14 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                rel1 { relative: 0.0 1.0; to_x: "elm.text"; to_y: "padding_left_top"; }
                rel2 { relative: 0.0 0.0; to_x: "elm.text"; to_y: "padding_right_bottom"; }
                fixed: 1 0;
-               min: 6 0;
+               min: BUTTON_NAVIBAR_RIGHT_PADDING_BEFORE_TEXT_DEFAULT_MIN_INC;
                color: 0 0 0 0;
             }
          }
          part { name: "elm.swallow.content";
             type: SWALLOW;
             scale: 1;
-            clip_to: "disabler";
+            clip_to: "clipper";
             description { state: "default" 0.0;
                visible: 0;
                align: 0.0 0.5;
@@ -8185,8 +8211,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             description { state: "visible" 0.0;
                fixed: 1 0;
                visible: 1;
-               min: 22 22;
-               max: 22 22;
+               min: BUTTON_NAVIBAR_RIGHT_SWALLOW_VISIBLE_MIN_MAX_INC;
+               max: BUTTON_NAVIBAR_RIGHT_SWALLOW_VISIBLE_MIN_MAX_INC;
                align: 1.0 0.5;
                rel1 { relative: 0.0 1.0; to_x: "padding_before_text"; to_y: "padding_left_top"; }
                rel2 { relative: 0.0 0.0; to_x: "padding_before_text"; to_y: "padding_right_bottom"; }
@@ -8195,8 +8221,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             }
             description { state: "icononly" 0.0;
                visible: 1;
-               min: 30 30;
-               max: 30 30;
+               min: BUTTON_NAVIBAR_RIGHT_SWALLOW_ICONONLY_MIN_MAX_INC;
+               max: BUTTON_NAVIBAR_RIGHT_SWALLOW_ICONONLY_MIN_MAX_INC;
                rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
                rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; }
                align: 0.5 0.5;
@@ -8208,7 +8234,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             type: TEXT;
             mouse_events:  0;
             scale: 1;
-            clip_to: "disabler";
+            clip_to: "clipper";
             description { state: "default" 0.0;
                visible: 0;
                rel1 { relative: 1.0 1.0; to_x: "padding_after_icon"; to_y: "padding_left_top"; }
@@ -8217,7 +8243,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                color: 255 255 255 255;
                text {
                   font: "SLP:style=Medium";
-                  size: 20;
+                  size: BUTTON_NAVIBAR_RIGHT_TEXT_FONT_SIZE_INC;
                   min:  0 0;
                   align: 1.0 0.5;
                   max: 1 0;
@@ -8256,7 +8282,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                color: 0 0 0 0;
             }
          }
-         part { name: "disabler";
+         part { name: "clipper";
             type: RECT;
             description { state: "default" 0.0;
                color: 255 255 255 255;
@@ -8265,6 +8291,17 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                color: 255 255 255 127;
             }
          }
+         part { name: "disabler";
+            type: RECT;
+            description { state: "default" 0.0;
+               color: 0 0 0 0;
+               visible: 0;
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
       }
       programs {
          program { name: "button_click";
@@ -8376,6 +8413,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             source: "elm";
             action: STATE_SET "disabled" 0.0;
             target: "button_image";
+            target: "clipper";
             target: "disabler";
             after: "disable_text";
          }
@@ -8390,6 +8428,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "button_image";
+            target: "clipper";
             target: "disabler";
             after: "enable_text";
          }

diff --git a/themes/images/nbeat-hd/00_Option_header_bt.png b/themes/images/nbeat-hd/00_Option_header_bt.png
old mode 100755 (executable)
new mode 100644 (file)
index c5d3ff6..659fc23
Binary files a/themes/images/nbeat-hd/00_Option_header_bt.png and b/themes/images/nbeat-hd/00_Option_header_bt.png differ

diff --git a/themes/images/nbeat-hd/00_Option_header_bt_dim.png b/themes/images/nbeat-hd/00_Option_header_bt_dim.png
old mode 100755 (executable)
new mode 100644 (file)
index 3eead1d..3fb76e2
Binary files a/themes/images/nbeat-hd/00_Option_header_bt_dim.png and b/themes/images/nbeat-hd/00_Option_header_bt_dim.png differ

diff --git a/themes/images/nbeat-hd/00_Option_header_bt_press.png b/themes/images/nbeat-hd/00_Option_header_bt_press.png
old mode 100755 (executable)
new mode 100644 (file)
index 00510b5..8a05504
Binary files a/themes/images/nbeat-hd/00_Option_header_bt_press.png and b/themes/images/nbeat-hd/00_Option_header_bt_press.png differ

diff --git a/themes/inc/nbeat-black-inc.edc b/themes/inc/nbeat-black-inc.edc
index 3640e8f..2bbf68a 100644 (file)
--- a/themes/inc/nbeat-black-inc.edc
+++ b/themes/inc/nbeat-black-inc.edc
@@ -309,6 +309,39 @@
 #define BUTTON_NAVIBAR_BACK_BUTTON_BUTTON_IMAGE_MIN_INC 67 40
 #define BUTTON_NAVIBAR_BACK_BUTTON_BG_MIN_MAX_INC 22 20
 
+#define BUTTON_NAVIBAR_CENTER_BG_NORMAL_MIN_W_INC 22
+#define BUTTON_NAVIBAR_CENTER_BG_NORMAL_MIN_H_INC 46
+#define BUTTON_NAVIBAR_CENTER_BG_NORMAL_BORDER_INC 4 4 4 4
+#define BUTTON_NAVIBAR_CENTER_PADDING_MIN_MAX_INC 10 5
+#define BUTTON_NAVIBAR_CENTER_ICON_RECT_VISIBLE_MIN_SIZE 22 22
+#define BUTTON_NAVIBAR_CENTER_PADDING_AFTER_ICON_VISIBLE_MIN_INC 6 0
+#define BUTTON_NAVIBAR_CENTER_PADDING_BEFORE_TEXT_DEFAULT_MIN_INC 6 0
+#define BUTTON_NAVIBAR_CENTER_SWALLOW_VISIBLE_MIN_MAX_INC 22 22
+#define BUTTON_NAVIBAR_CENTER_SWALLOW_ICONONLY_MIN_MAX_INC 30 30
+#define BUTTON_NAVIBAR_CENTER_TEXT_FONT_SIZE_INC 20
+
+#define BUTTON_NAVIBAR_LEFT_BG_NORMAL_MIN_W_INC 22
+#define BUTTON_NAVIBAR_LEFT_BG_NORMAL_MIN_H_INC 46
+#define BUTTON_NAVIBAR_LEFT_BG_NORMAL_BORDER_INC 4 4 4 4
+#define BUTTON_NAVIBAR_LEFT_PADDING_MIN_MAX_INC 10 5
+#define BUTTON_NAVIBAR_LEFT_ICON_RECT_VISIBLE_MIN_SIZE 22 22
+#define BUTTON_NAVIBAR_LEFT_PADDING_AFTER_ICON_VISIBLE_MIN_INC 6 0
+#define BUTTON_NAVIBAR_LEFT_PADDING_BEFORE_TEXT_DEFAULT_MIN_INC 6 0
+#define BUTTON_NAVIBAR_LEFT_SWALLOW_VISIBLE_MIN_MAX_INC 22 22
+#define BUTTON_NAVIBAR_LEFT_SWALLOW_ICONONLY_MIN_MAX_INC 30 30
+#define BUTTON_NAVIBAR_LEFT_TEXT_FONT_SIZE_INC 20
+
+#define BUTTON_NAVIBAR_RIGHT_BG_NORMAL_MIN_W_INC 22
+#define BUTTON_NAVIBAR_RIGHT_BG_NORMAL_MIN_H_INC 46
+#define BUTTON_NAVIBAR_RIGHT_BG_NORMAL_BORDER_INC 4 4 4 4
+#define BUTTON_NAVIBAR_RIGHT_PADDING_MIN_MAX_INC 10 5
+#define BUTTON_NAVIBAR_RIGHT_ICON_RECT_VISIBLE_MIN_SIZE 22 22
+#define BUTTON_NAVIBAR_RIGHT_PADDING_AFTER_ICON_VISIBLE_MIN_INC 6 0
+#define BUTTON_NAVIBAR_RIGHT_PADDING_BEFORE_TEXT_DEFAULT_MIN_INC 6 0
+#define BUTTON_NAVIBAR_RIGHT_SWALLOW_VISIBLE_MIN_MAX_INC 22 22
+#define BUTTON_NAVIBAR_RIGHT_SWALLOW_ICONONLY_MIN_MAX_INC 30 30
+#define BUTTON_NAVIBAR_RIGHT_TEXT_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 040b52b..6d2336b 100644 (file)
--- a/themes/inc/nbeat-hd-inc.edc
+++ b/themes/inc/nbeat-hd-inc.edc
@@ -334,6 +334,39 @@
 #define BUTTON_NAVIBAR_BACK_BUTTON_BUTTON_IMAGE_MIN_INC 106 40
 #define BUTTON_NAVIBAR_BACK_BUTTON_BG_MIN_MAX_INC 36 32
 
+#define BUTTON_NAVIBAR_CENTER_BG_NORMAL_MIN_W_INC 36
+#define BUTTON_NAVIBAR_CENTER_BG_NORMAL_MIN_H_INC 74
+#define BUTTON_NAVIBAR_CENTER_BG_NORMAL_BORDER_INC 5 5 5 5
+#define BUTTON_NAVIBAR_CENTER_PADDING_MIN_MAX_INC 16 5
+#define BUTTON_NAVIBAR_CENTER_ICON_RECT_VISIBLE_MIN_SIZE 36 36
+#define BUTTON_NAVIBAR_CENTER_PADDING_AFTER_ICON_VISIBLE_MIN_INC 6 0
+#define BUTTON_NAVIBAR_CENTER_PADDING_BEFORE_TEXT_DEFAULT_MIN_INC 6 0
+#define BUTTON_NAVIBAR_CENTER_SWALLOW_VISIBLE_MIN_MAX_INC 36 36
+#define BUTTON_NAVIBAR_CENTER_SWALLOW_ICONONLY_MIN_MAX_INC 38 38
+#define BUTTON_NAVIBAR_CENTER_TEXT_FONT_SIZE_INC 32
+
+#define BUTTON_NAVIBAR_LEFT_BG_NORMAL_MIN_W_INC 36
+#define BUTTON_NAVIBAR_LEFT_BG_NORMAL_MIN_H_INC 74
+#define BUTTON_NAVIBAR_LEFT_BG_NORMAL_BORDER_INC 5 5 5 5
+#define BUTTON_NAVIBAR_LEFT_PADDING_MIN_MAX_INC 16 5
+#define BUTTON_NAVIBAR_LEFT_ICON_RECT_VISIBLE_MIN_SIZE 36 36
+#define BUTTON_NAVIBAR_LEFT_PADDING_AFTER_ICON_VISIBLE_MIN_INC 6 0
+#define BUTTON_NAVIBAR_LEFT_PADDING_BEFORE_TEXT_DEFAULT_MIN_INC 6 0
+#define BUTTON_NAVIBAR_LEFT_SWALLOW_VISIBLE_MIN_MAX_INC 36 36
+#define BUTTON_NAVIBAR_LEFT_SWALLOW_ICONONLY_MIN_MAX_INC 38 38
+#define BUTTON_NAVIBAR_LEFT_TEXT_FONT_SIZE_INC 32
+
+#define BUTTON_NAVIBAR_RIGHT_BG_NORMAL_MIN_W_INC 36
+#define BUTTON_NAVIBAR_RIGHT_BG_NORMAL_MIN_H_INC 74
+#define BUTTON_NAVIBAR_RIGHT_BG_NORMAL_BORDER_INC 5 5 5 5
+#define BUTTON_NAVIBAR_RIGHT_PADDING_MIN_MAX_INC 16 5
+#define BUTTON_NAVIBAR_RIGHT_ICON_RECT_VISIBLE_MIN_SIZE 36 36
+#define BUTTON_NAVIBAR_RIGHT_PADDING_AFTER_ICON_VISIBLE_MIN_INC 6 0
+#define BUTTON_NAVIBAR_RIGHT_PADDING_BEFORE_TEXT_DEFAULT_MIN_INC 6 0
+#define BUTTON_NAVIBAR_RIGHT_SWALLOW_VISIBLE_MIN_MAX_INC 36 36
+#define BUTTON_NAVIBAR_RIGHT_SWALLOW_ICONONLY_MIN_MAX_INC 38 38
+#define BUTTON_NAVIBAR_RIGHT_TEXT_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 879c004..9d82e0b 100644 (file)
--- a/themes/inc/nbeat-inc.edc
+++ b/themes/inc/nbeat-inc.edc
@@ -333,6 +333,39 @@
 #define BUTTON_NAVIBAR_BACK_BUTTON_BUTTON_IMAGE_MIN_INC 67 40
 #define BUTTON_NAVIBAR_BACK_BUTTON_BG_MIN_MAX_INC 22 20
 
+#define BUTTON_NAVIBAR_CENTER_BG_NORMAL_MIN_W_INC 22
+#define BUTTON_NAVIBAR_CENTER_BG_NORMAL_MIN_H_INC 46
+#define BUTTON_NAVIBAR_CENTER_BG_NORMAL_BORDER_INC 4 4 4 4
+#define BUTTON_NAVIBAR_CENTER_PADDING_MIN_MAX_INC 10 5
+#define BUTTON_NAVIBAR_CENTER_ICON_RECT_VISIBLE_MIN_SIZE 22 22
+#define BUTTON_NAVIBAR_CENTER_PADDING_AFTER_ICON_VISIBLE_MIN_INC 6 0
+#define BUTTON_NAVIBAR_CENTER_PADDING_BEFORE_TEXT_DEFAULT_MIN_INC 6 0
+#define BUTTON_NAVIBAR_CENTER_SWALLOW_VISIBLE_MIN_MAX_INC 22 22
+#define BUTTON_NAVIBAR_CENTER_SWALLOW_ICONONLY_MIN_MAX_INC 30 30
+#define BUTTON_NAVIBAR_CENTER_TEXT_FONT_SIZE_INC 20
+
+#define BUTTON_NAVIBAR_LEFT_BG_NORMAL_MIN_W_INC 22
+#define BUTTON_NAVIBAR_LEFT_BG_NORMAL_MIN_H_INC 46
+#define BUTTON_NAVIBAR_LEFT_BG_NORMAL_BORDER_INC 4 4 4 4
+#define BUTTON_NAVIBAR_LEFT_PADDING_MIN_MAX_INC 10 5
+#define BUTTON_NAVIBAR_LEFT_ICON_RECT_VISIBLE_MIN_SIZE 22 22
+#define BUTTON_NAVIBAR_LEFT_PADDING_AFTER_ICON_VISIBLE_MIN_INC 6 0
+#define BUTTON_NAVIBAR_LEFT_PADDING_BEFORE_TEXT_DEFAULT_MIN_INC 6 0
+#define BUTTON_NAVIBAR_LEFT_SWALLOW_VISIBLE_MIN_MAX_INC 22 22
+#define BUTTON_NAVIBAR_LEFT_SWALLOW_ICONONLY_MIN_MAX_INC 30 30
+#define BUTTON_NAVIBAR_LEFT_TEXT_FONT_SIZE_INC 20
+
+#define BUTTON_NAVIBAR_RIGHT_BG_NORMAL_MIN_W_INC 22
+#define BUTTON_NAVIBAR_RIGHT_BG_NORMAL_MIN_H_INC 46
+#define BUTTON_NAVIBAR_RIGHT_BG_NORMAL_BORDER_INC 4 4 4 4
+#define BUTTON_NAVIBAR_RIGHT_PADDING_MIN_MAX_INC 10 5
+#define BUTTON_NAVIBAR_RIGHT_ICON_RECT_VISIBLE_MIN_SIZE 22 22
+#define BUTTON_NAVIBAR_RIGHT_PADDING_AFTER_ICON_VISIBLE_MIN_INC 6 0
+#define BUTTON_NAVIBAR_RIGHT_PADDING_BEFORE_TEXT_DEFAULT_MIN_INC 6 0
+#define BUTTON_NAVIBAR_RIGHT_SWALLOW_VISIBLE_MIN_MAX_INC 22 22
+#define BUTTON_NAVIBAR_RIGHT_SWALLOW_ICONONLY_MIN_MAX_INC 30 30
+#define BUTTON_NAVIBAR_RIGHT_TEXT_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