From 62d1cfef0800eed086a7d01b8d333dc36a5cc98f Mon Sep 17 00:00:00 2001
From: ChunEon Park <chuneon.park@samsung.com>
Date: Thu, 15 Sep 2011 18:01:52 +0900
Subject: [PATCH] naviframe - support hd and multiline button

Change-Id: I64aa5ea5f700f9c371257798a79b16be736af26c
---
 themes/groups/button.edc                           |   3 +-
 themes/groups/naviframe.edc                        |  89 ++++++++++-----------
 themes/images/nbeat-hd/naviframe_optionheader.png  | Bin 152 -> 2791 bytes
 .../nbeat-hd/naviframe_optionheader_arrow.png      | Bin 3017 -> 3138 bytes
 .../nbeat-hd/naviframe_optionheader_shadow.png     | Bin 160 -> 151 bytes
 themes/inc/nbeat-black-inc.edc                     |  11 +++
 themes/inc/nbeat-hd-inc.edc                        |  11 +++
 themes/inc/nbeat-inc.edc                           |  11 +++
 themes/nbeat.edc                                   |   3 -
 9 files changed, 77 insertions(+), 51 deletions(-)

diff --git a/themes/groups/button.edc b/themes/groups/button.edc
index d15622b..16e56ba 100644
--- 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
--- 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 cf080bb8562b547b8aa70a61b033176e01ece1f1..5e06ea0a1c59f259e178b3b84bc1df8867337ee9 100644
GIT binary patch
delta 2756
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
KMNUMnLSTZBzA)YZ

delta 92
zcmaDZI)ib7xHu~Z8v_GFOH12)AjMc5<nF|<?wria$u(StmMmf%CVH_3?*2e22~QWt
u5RU7~J1!~yo!>e2w>`5kGc&UgBZKEN=Du#fZ#RKz7(8A5T-G@yGywpm0vj~|

diff --git a/themes/images/nbeat-hd/naviframe_optionheader_arrow.png b/themes/images/nbeat-hd/naviframe_optionheader_arrow.png
index 52cc727bb15642a36048c67ac2b15591ff05a16d..2f1f65175959e938aee805c2c2849a019987e98a 100644
GIT binary patch
delta 478
zcmV<40U`d$7s41JiBL{Q4GJ0x0000DNk~Le0000J0000E2nGNE0L>UDiLo|b3J(Ti
zOGiWi{{a60|De66laV18e*gz`Nliru+XxE>D-b=@aRdMW0dz@3K~y-)rINpDltCOt
z@4fSXzS)^|A!!6r5CT@I1bqlW5CVaSkV+85BH#nqidI_%(uuGbd<5S|#6m$aWWN-P
zNjBMCjh^~9r#N%j_dVXdSi>@mP)O|eJsuxV@oUk|_M6WD0AU42e?ama53{zC=W7uw
zSt=ud;J7pFv@;qAE$dlue87K^dCQGK)VL<03qsApAo0Li+_;j=8u%{qeakGt5k^3C
zM9Ug=K@%hRzmkbSa(vseHglMXe)r3PXr1n6&sU53X+fv$*6C@9gt_p-iYSq&S$o0p
zA(zQG>vX3k?bjqYe@pPfH3@jj^Zjlwlo^9k5)WI)6dbW^2I8#WFsqfQi8V-bG9#c1
zI%ruN*`IY<wZ9yQmbIBZ$8)ma_`D`QDv_|}56e6ip7wk4@#Xq10Pw@!+P!N<pGHMK
zy33tb(f7d5qaI(rO@Dm-KD}>C<fJD0a7EGlhcF!-^U&U0Ah*}?9~c2O2{q}~2{6Mn
UJyQvsOaK4?07*qoM6N<$f)S9@*Z=?k

delta 358
zcmV-s0h#{77|9nQiBL{Q4GJ0x0000DNk~Le0000F0000B2nGNE0H8<LT$7Fp7qKH;
z3V$GDNK#Dz0D2_=0Dyx40Qvs_0D$QL0Cg|`0P0`>06Lfe02gnPU&TfM008t!L_t(|
z+LX{CP6R;^1<<PM>e_+MjzDc##}yz1fk1Hy61V{*++rmmK_PG$1SAB3!EgzV(LI>1
zWU3IT1!kH3_UBb4A3v_QVJKSkP+EB(>VIhkJaG5dn(NhCSUa7W*@H}Fg94pv*3(hA
z=E~mtvm}`#A#h@F@Ea|<H|FylH@r*nyFx^esU$Od)J|uExR!cJOediUOV^MPB+1-+
zf2z6iFRVq65pfYy{Ck{85Sp+L0Jlq6JKeF~?qiA!E5Z!}F`d<1F8}~YJ5AQxi#N2g
zg@o{5;${RyTxiiFCgD$+5R482NGlUJe<NN8{uuFV0MX7^6h2OUMF0Q*07*qoM6N<$
Eg6}hlxBvhE

diff --git a/themes/images/nbeat-hd/naviframe_optionheader_shadow.png b/themes/images/nbeat-hd/naviframe_optionheader_shadow.png
index 05d347df5a13c09eeeabcf2c7d341af6d5a7eb28..bd4d550277d6b0fb4c461ea0f312e6d440dc6f84 100644
GIT binary patch
delta 63
zcmZ3$IGu4qyafk0yQz|*lYBG-1B1Ayi(?4K_2d=n)}<vRB_uc~Nq_)@;w;9Bh@`@E
PKqU;Gu6{1-oD!M<2`CW{

delta 72
zcmbQvxPWm&yd#Skr@Z1W+p`S}3=9gME{-7_*I5rT@-i53FmFgp%1`nWJdk@K>vt2c
c+K&ee?g}ieDZe^q0o5{iy85}Sb4q9e02rPZIsgCw

diff --git a/themes/inc/nbeat-black-inc.edc b/themes/inc/nbeat-black-inc.edc
index 6831147..88daf5b 100644
--- 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
--- 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
--- 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
--- 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";
 }
-- 
2.7.4