naviframe - support hd and multiline button

Change-Id: I64aa5ea5f700f9c371257798a79b16be736af26c

diff --git a/themes/groups/button.edc b/themes/groups/button.edc
index d15622b..16e56ba 100644 (file)
--- a/themes/groups/button.edc
+++ b/themes/groups/button.edc
@@ -6272,7 +6272,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/navigationbar_control/multiline";
+   group { name: "elm/button/base/naviframe_control/multiline";
+      alias: "elm/button/base/navigationbar_control/multiline";
       script {
          public button_state = BUTTON_STATE_ENABLED;
       }

diff --git a/themes/groups/naviframe.edc b/themes/groups/naviframe.edc
index 8bdd0cf..32b4bcd 100644 (file)
--- a/themes/groups/naviframe.edc
+++ b/themes/groups/naviframe.edc
@@ -21,11 +21,6 @@
  *
  */
 
-#define NAVIFRAME_OH_CLOSED_H 5
-#define NAVIFRAME_OH_OPENED_H 65
-#define NAVIFRAME_OH_OPENED_DOUBLE_H 124
-#define NAVIFRAME_OH_SHADOW_H 5
-
 ///////////////////////////////////////////////////////////////////////////
 // Naviframe
 ///////////////////////////////////////////////////////////////////////////
@@ -54,7 +49,7 @@
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: 1 NAVIFRAME_TITLE_H;
+               min: 1 NAVIFRAME_TITLE_H_INC;
                align: 0.0 0.0;
                fixed: 0 1;
                rel1 { relative: 0.0 0.0; }
@@ -72,7 +67,7 @@
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: 1 NAVIFRAME_OH_CLOSED_H;
+               min: 1 NAVIFRAME_OH_CLOSED_H_INC;
                align: 0.5 0;
                fixed: 0 1;
                rel1.to_x: "elm.swallow.content";
@@ -83,7 +78,7 @@
             }
             description { state: "show" 0.0;
                inherit: "default" 0.0;
-               min: 1 NAVIFRAME_OH_OPENED_H;
+               min: 1 NAVIFRAME_OH_OPENED_H_INC;
             }
          }
          part { name: "optionheader_bg";
@@ -103,7 +98,7 @@
             scale: 1;
             clip_to: "optionheader_clip";
             description { state: "default" 0.0;
-               min: 1 NAVIFRAME_OH_OPENED_H;
+               min: 1 NAVIFRAME_OH_OPENED_H_INC;
                rel1.to: "optionheader_bg";
                rel2.to: "optionheader_bg";
                rel2.relative: 1 0;
@@ -156,7 +151,7 @@
             clip_to: "title_clip";
             scale: 1;
             description { state: "default" 0.0;
-               min: 1 NAVIFRAME_TITLE_H;
+               min: 1 NAVIFRAME_TITLE_H_INC;
                align: 0.5 0.0;
                fixed: 0 1;
                rel1 { relative: 0.0 0.0; }
@@ -170,7 +165,7 @@
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: 82 0;
+               min: NAVIFRAME_INDICATOR_W_INC 0;
                fixed: 1 0;
                align: 0.0 0.5;
                rel1 { relative: 0.0 0.0; to: "title_base"; }
@@ -179,7 +174,7 @@
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
-               min: 102 0;
+               min: NAVIFRAME_PADDING_EXPANDED_INC 0;
             }
          }
          part { name: "separator_1";
@@ -216,7 +211,7 @@
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: 80 0;
+               min: NAVIFRAME_INDICATOR_W_INC 0;
                fixed: 1 0;
                align: 1.0 0.5;
                rel1 { relative: 1.0 0.0; to: "title_base"; }
@@ -230,7 +225,7 @@
             clip_to: "title_clip";
             description { state: "default" 0.0;
                text { font: "SLP:style=Medium";
-                  size: 22;
+                  size: NAVIFRAME_TITLE_FONT_SIZE_INC;
                   min: 0 0;
                   max: 1 0;
                   align: 0.5 0.5;
@@ -264,7 +259,7 @@
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               max: 20 20;
+               max: NAVIFRAME_ICON_SIZE_INC;
                rel1 { relative: 0.0 0.0; to_x: "padding_before_text"; }
                rel2 { relative: 0.0 1.0; to_x: "padding_before_text"; }
                aspect: 1.0 1.0;
@@ -282,7 +277,7 @@
                rel1 { relative: 0.0 0.0; to_x: "elm.text.title"; }
                rel2 { relative: 0.0 1.0; to_x: "elm.text.title"; }
                fixed: 1 0;
-               min: 10 0;
+               min: NAVIFRAME_ICON_PADDING_INC;
                visible: 0;
             }
          }
@@ -291,8 +286,8 @@
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: 15 11;
-               max: 15 11;
+               min: NAVIFRAME_OH_ARROW_SIZE_INC;
+               max: NAVIFRAME_OH_ARROW_SIZE_INC;
                fixed: 1 1;
                align: 0.5 1;
                visible: 0;
@@ -315,7 +310,7 @@
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: 1 NAVIFRAME_OH_SHADOW_H;
+               min: 1 NAVIFRAME_OH_SHADOW_H_INC;
                fixed: 0 1;
                align: 0.5 0;
                color: 255 255 255 0;
@@ -457,7 +452,7 @@
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: 1 NAVIFRAME_TITLE_H;
+               min: 1 NAVIFRAME_TITLE_H_INC;
                align: 0.0 0.0;
                fixed: 0 1;
                rel1 { relative: 0.0 0.0; }
@@ -475,7 +470,7 @@
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: 1 NAVIFRAME_OH_CLOSED_H;
+               min: 1 NAVIFRAME_OH_CLOSED_H_INC;
                align: 0.5 0;
                fixed: 0 1;
                rel1.to_x: "elm.swallow.content";
@@ -486,7 +481,7 @@
             }
             description { state: "show" 0.0;
                inherit: "default" 0.0;
-               min: 1 NAVIFRAME_OH_OPENED_DOUBLE_H;
+               min: 1 NAVIFRAME_OH_OPENED_DOUBLE_H_INC;
             }
          }
          part { name: "optionheader_bg";
@@ -506,7 +501,7 @@
             scale: 1;
             clip_to: "optionheader_clip";
             description { state: "default" 0.0;
-               min: 1 NAVIFRAME_OH_OPENED_DOUBLE_H;
+               min: 1 NAVIFRAME_OH_OPENED_DOUBLE_H_INC;
                rel1.to: "optionheader_bg";
                rel2.to: "optionheader_bg";
                rel2.relative: 1 0;
@@ -559,7 +554,7 @@
             clip_to: "title_clip";
             scale: 1;
             description { state: "default" 0.0;
-               min: 1 NAVIFRAME_TITLE_H;
+               min: 1 NAVIFRAME_TITLE_H_INC;
                align: 0.5 0.0;
                fixed: 0 1;
                rel1 { relative: 0.0 0.0; }
@@ -573,7 +568,7 @@
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: 82 0;
+               min: NAVIFRAME_INDICATOR_W_INC 0;
                fixed: 1 0;
                align: 0.0 0.5;
                rel1 { relative: 0.0 0.0; to: "title_base"; }
@@ -582,7 +577,7 @@
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
-               min: 102 0;
+               min: NAVIFRAME_PADDING_EXPANDED_INC 0;
             }
          }
          part { name: "separator_1";
@@ -619,7 +614,7 @@
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: 80 0;
+               min: NAVIFRAME_INDICATOR_W_INC 0;
                fixed: 1 0;
                align: 1.0 0.5;
                rel1 { relative: 1.0 0.0; to: "title_base"; }
@@ -633,7 +628,7 @@
             clip_to: "title_clip";
             description { state: "default" 0.0;
                text { font: "SLP:style=Medium";
-                  size: 22;
+                  size: NAVIFRAME_TITLE_FONT_SIZE_INC;
                   min: 0 0;
                   max: 1 0;
                   align: 0.5 0.5;
@@ -667,7 +662,7 @@
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               max: 20 20;
+               max: NAVIFRAME_ICON_SIZE_INC;
                rel1 { relative: 0.0 0.0; to_x: "padding_before_text"; }
                rel2 { relative: 0.0 1.0; to_x: "padding_before_text"; }
                aspect: 1.0 1.0;
@@ -685,7 +680,7 @@
                rel1 { relative: 0.0 0.0; to_x: "elm.text.title"; }
                rel2 { relative: 0.0 1.0; to_x: "elm.text.title"; }
                fixed: 1 0;
-               min: 10 0;
+               min: NAVIFRAME_ICON_PADDING_INC;
                visible: 0;
             }
          }
@@ -695,8 +690,8 @@
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: 15 11;
-               max: 15 11;
+               min: NAVIFRAME_OH_ARROW_SIZE_INC;
+               max: NAVIFRAME_OH_ARROW_SIZE_INC;
                fixed: 1 1;
                align: 0.5 1;
                visible: 0;
@@ -719,7 +714,7 @@
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: 1 NAVIFRAME_OH_SHADOW_H;
+               min: 1 NAVIFRAME_OH_SHADOW_H_INC;
                fixed: 0 1;
                align: 0.5 0;
                color: 255 255 255 0;
@@ -856,7 +851,7 @@
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: 1 NAVIFRAME_TITLE_H;
+               min: 1 NAVIFRAME_TITLE_H_INC;
                align: 0.0 0.0;
                fixed: 0 1;
                rel1 { relative: 0.0 0.0; }
@@ -874,7 +869,7 @@
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: 1 NAVIFRAME_OH_CLOSED_H;
+               min: 1 NAVIFRAME_OH_CLOSED_H_INC;
                align: 0.5 0;
                fixed: 0 1;
                rel1 { to: "title_clip"; relative: 0 1; }
@@ -882,7 +877,7 @@
             }
             description { state: "show" 0.0;
                inherit: "default" 0.0;
-               min: 1 NAVIFRAME_OH_OPENED_H;
+               min: 1 NAVIFRAME_OH_OPENED_H_INC;
             }
          }
          part { name: "optionheader_bg";
@@ -902,7 +897,7 @@
             scale: 1;
             clip_to: "optionheader_clip";
             description { state: "default" 0.0;
-               min: 1 NAVIFRAME_OH_OPENED_H;
+               min: 1 NAVIFRAME_OH_OPENED_H_INC;
                rel1.to: "optionheader_bg";
                rel2.to: "optionheader_bg";
                rel2.relative: 1 0;
@@ -945,7 +940,7 @@
             clip_to: "title_clip";
             scale: 1;
             description { state: "default" 0.0;
-               min: 1 NAVIFRAME_TITLE_H;
+               min: 1 NAVIFRAME_TITLE_H_INC;
                align: 0.5 0.0;
                fixed: 0 1;
                rel1 { relative: 0.0 0.0; }
@@ -959,7 +954,7 @@
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: 82 0;
+               min: NAVIFRAME_INDICATOR_W_INC 0;
                fixed: 1 0;
                align: 0.0 0.5;
                rel1 { relative: 0.0 0.0; to: "title_base"; }
@@ -968,7 +963,7 @@
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
-               min: 102 0;
+               min: NAVIFRAME_PADDING_EXPANDED_INC 0;
             }
          }
          part { name: "separator_1";
@@ -1005,7 +1000,7 @@
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: 80 0;
+               min: NAVIFRAME_INDICATOR_W_INC 0;
                fixed: 1 0;
                align: 1.0 0.5;
                rel1 { relative: 1.0 0.0; to: "title_base"; }
@@ -1019,7 +1014,7 @@
             clip_to: "title_clip";
             description { state: "default" 0.0;
                text { font: "SLP:style=Medium";
-                  size: 22;
+                  size: NAVIFRAME_TITLE_FONT_SIZE_INC;
                   min: 0 0;
                   max: 1 0;
                   align: 0.5 0.5;
@@ -1053,7 +1048,7 @@
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               max: 20 20;
+               max: NAVIFRAME_ICON_SIZE_INC;
                rel1 { relative: 0.0 0.0; to_x: "padding_before_text"; }
                rel2 { relative: 0.0 1.0; to_x: "padding_before_text"; }
                aspect: 1.0 1.0;
@@ -1071,7 +1066,7 @@
                rel1 { relative: 0.0 0.0; to_x: "elm.text.title"; }
                rel2 { relative: 0.0 1.0; to_x: "elm.text.title"; }
                fixed: 1 0;
-               min: 10 0;
+               min: NAVIFRAME_ICON_PADDING_INC;
                visible: 0;
             }
          }
@@ -1080,8 +1075,8 @@
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: 15 11;
-               max: 15 11;
+               min: NAVIFRAME_OH_ARROW_SIZE_INC;
+               max: NAVIFRAME_OH_ARROW_SIZE_INC;
                fixed: 1 1;
                align: 0.5 1;
                visible: 0;
@@ -1105,7 +1100,7 @@
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: 1 NAVIFRAME_OH_SHADOW_H;
+               min: 1 NAVIFRAME_OH_SHADOW_H_INC;
                fixed: 0 1;
                align: 0.5 0;
                color: 255 255 255 0;

diff --git a/themes/images/nbeat-hd/naviframe_optionheader.png b/themes/images/nbeat-hd/naviframe_optionheader.png
index cf080bb..5e06ea0 100644 (file)
Binary files a/themes/images/nbeat-hd/naviframe_optionheader.png and b/themes/images/nbeat-hd/naviframe_optionheader.png differ

diff --git a/themes/images/nbeat-hd/naviframe_optionheader_arrow.png b/themes/images/nbeat-hd/naviframe_optionheader_arrow.png
index 52cc727..2f1f651 100644 (file)
Binary files a/themes/images/nbeat-hd/naviframe_optionheader_arrow.png and b/themes/images/nbeat-hd/naviframe_optionheader_arrow.png differ

diff --git a/themes/images/nbeat-hd/naviframe_optionheader_shadow.png b/themes/images/nbeat-hd/naviframe_optionheader_shadow.png
index 05d347d..bd4d550 100644 (file)
Binary files a/themes/images/nbeat-hd/naviframe_optionheader_shadow.png and b/themes/images/nbeat-hd/naviframe_optionheader_shadow.png differ

diff --git a/themes/inc/nbeat-black-inc.edc b/themes/inc/nbeat-black-inc.edc
index 6831147..88daf5b 100644 (file)
--- a/themes/inc/nbeat-black-inc.edc
+++ b/themes/inc/nbeat-black-inc.edc
@@ -30,6 +30,17 @@
 #define LAYOUT_EDIT_MODE_BG_COLOR_INC 36 36 36 255
 #define LAYOUT_GROUP_LIST_BG_COLOR_INC 15 15 15 255
 
+#define NAVIFRAME_TITLE_H_INC 50
+#define NAVIFRAME_OH_CLOSED_H_INC 5
+#define NAVIFRAME_OH_OPENED_H_INC 65
+#define NAVIFRAME_OH_OPENED_DOUBLE_H_INC 124
+#define NAVIFRAME_OH_SHADOW_H_INC 5
+#define NAVIFRAME_INDICATOR_W_INC 80
+#define NAVIFRAME_PADDING_EXPANDED_INC 102
+#define NAVIFRAME_TITLE_FONT_SIZE_INC 22
+#define NAVIFRAME_ICON_SIZE_INC 20 20
+#define NAVIFRAME_ICON_PADDING_INC 10 0
+#define NAVIFRAME_OH_ARROW_SIZE_INC 15 11
 #define NAVIFRAME_TITLE_TEXT_COLOR_INC 235 236 237 255
 #define NAVIFRAME_TITLE_BG_COLOR_INC 50 65 74 255
 #define NAVIFRAME_TITLE_LEFT_SEPARATOR_COLOR_INC 0 15 30 255

diff --git a/themes/inc/nbeat-hd-inc.edc b/themes/inc/nbeat-hd-inc.edc
index 17ada79..12c9f9b 100644 (file)
--- a/themes/inc/nbeat-hd-inc.edc
+++ b/themes/inc/nbeat-hd-inc.edc
@@ -30,6 +30,17 @@
 #define LAYOUT_EDIT_MODE_BG_COLOR_INC 218 210 201 255
 #define LAYOUT_GROUP_LIST_BG_COLOR_INC 242 238 233 255
 
+#define NAVIFRAME_TITLE_H_INC 90
+#define NAVIFRAME_OH_CLOSED_H_INC 8
+#define NAVIFRAME_OH_OPENED_H_INC 106
+#define NAVIFRAME_OH_OPENED_DOUBLE_H_INC 196
+#define NAVIFRAME_OH_SHADOW_H_INC 0
+#define NAVIFRAME_INDICATOR_W_INC 128
+#define NAVIFRAME_PADDING_EXPANDED_INC 141
+#define NAVIFRAME_TITLE_FONT_SIZE_INC 36
+#define NAVIFRAME_ICON_SIZE_INC 32 32
+#define NAVIFRAME_ICON_PADDING_INC 16 0
+#define NAVIFRAME_OH_ARROW_SIZE_INC 19 14
 #define NAVIFRAME_TITLE_TEXT_COLOR_INC 73 44 7 255
 #define NAVIFRAME_TITLE_BG_COLOR_INC 219 201 174 255
 #define NAVIFRAME_TITLE_LEFT_SEPARATOR_COLOR_INC 164 151 130 255

diff --git a/themes/inc/nbeat-inc.edc b/themes/inc/nbeat-inc.edc
index df988b1..5bafa30 100644 (file)
--- a/themes/inc/nbeat-inc.edc
+++ b/themes/inc/nbeat-inc.edc
@@ -30,6 +30,17 @@
 #define LAYOUT_EDIT_MODE_BG_COLOR_INC 218 210 201 255
 #define LAYOUT_GROUP_LIST_BG_COLOR_INC 242 238 233 255
 
+#define NAVIFRAME_TITLE_H_INC 50
+#define NAVIFRAME_OH_CLOSED_H_INC 5
+#define NAVIFRAME_OH_OPENED_H_INC 65
+#define NAVIFRAME_OH_OPENED_DOUBLE_H_INC 124
+#define NAVIFRAME_OH_SHADOW_H_INC 5
+#define NAVIFRAME_INDICATOR_W_INC 80
+#define NAVIFRAME_PADDING_EXPANDED_INC 102
+#define NAVIFRAME_TITLE_FONT_SIZE_INC 22
+#define NAVIFRAME_ICON_SIZE_INC 20 20
+#define NAVIFRAME_ICON_PADDING_INC 10 0
+#define NAVIFRAME_OH_ARROW_SIZE_INC 15 11
 #define NAVIFRAME_TITLE_TEXT_COLOR_INC 73 44 7 255
 #define NAVIFRAME_TITLE_BG_COLOR_INC 219 201 174 255
 #define NAVIFRAME_TITLE_LEFT_SEPARATOR_COLOR_INC 164 151 130 255

diff --git a/themes/nbeat.edc b/themes/nbeat.edc
index 0de8988..0e2d005 100644 (file)
--- a/themes/nbeat.edc
+++ b/themes/nbeat.edc
@@ -32,15 +32,12 @@
 #include "inc/tmp-inc.edc"
 
 #define INDICATOR_H            27
-#define NAVIFRAME_TITLE_H              50
-#define NAVI_BAR_H             55
 #define CONTROLBAR_LARGE_H             78
 #define CONTROLBAR_SMALL_H             65
 #define CONTROLBAR_W                   78
 #define SOFTKEY_H              72
 #define SEGMENT_H              50
 
-
 externals {
    external: "elm";
 }