[Refactoring] Fixed navigationbar macro warnings.

diff --git a/themes/groups/navigationbar.edc b/themes/groups/navigationbar.edc
index 423f61e..bac1199 100644 (file)
--- a/themes/groups/navigationbar.edc
+++ b/themes/groups/navigationbar.edc
@@ -28,7 +28,6 @@
 #define ITEM_WIDTH   0
 #define MAX_ITEM_WIDTH 112
 #define NAVI_BAR_EXTENDED_FNBTN_TOP_HEIGHT 110
-#define NAVI_BAR_H 55
 #define NAVI_BAR_EXTENDED_HEIGHT 115
 
 ////////////////////////////////////////////////////////////////////////////////////////

diff --git a/themes/groups/navigationbar_ex.edc b/themes/groups/navigationbar_ex.edc
index 63f01f4..71e73f9 100644 (file)
--- a/themes/groups/navigationbar_ex.edc
+++ b/themes/groups/navigationbar_ex.edc
@@ -1,8 +1,6 @@
-#define PADDING         5
-#define ITEM_HEIGHT     50
+#define EX_ITEM_HEIGHT     50
 #define ITEM_WIDTH      0
 #define MAX_ITEM_WIDTH 112
-#define NAVI_BAR_EXTENDED_HEIGHT 93
 #define NAVI_BAR_EXTENDED_FNBTN_TOP_HEIGHT 110
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -375,8 +373,8 @@ group { name: "elm/navigationbar_ex/item/topbar_1fn/default";
          scale: 1;
          description {
             fixed: 1 1;
-            min: ITEM_WIDTH ITEM_HEIGHT;
-            max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+            min: ITEM_WIDTH EX_ITEM_HEIGHT;
+            max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 0.0 0.0; to: "elm.rect.pad1"; }
             rel2 { relative: 0.0 1.0; to: "elm.rect.pad1"; }
@@ -528,8 +526,8 @@ group { name: "elm/navigationbar_ex/item/topbar_2fns/default";
          scale: 1;
          description {
             fixed: 1 1;
-            min: ITEM_WIDTH ITEM_HEIGHT;
-            max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+            min: ITEM_WIDTH EX_ITEM_HEIGHT;
+            max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 0.0 0.0; to: "elm.rect.pad2"; }
             rel2 { relative: 0.0 1.0; to: "elm.rect.pad2"; }
@@ -559,8 +557,8 @@ group { name: "elm/navigationbar_ex/item/topbar_2fns/default";
          scale: 1;
          description {
             fixed: 1 1;
-            min: ITEM_WIDTH ITEM_HEIGHT;
-            max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+            min: ITEM_WIDTH EX_ITEM_HEIGHT;
+            max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.pad1"; }
             rel2 { relative: 1.0 1.0; to: "elm.rect.pad1"; }
@@ -633,7 +631,7 @@ group { name: "elm/navigationbar_ex/item/topbar_obj_2fns/default";
          description {
             state: "default" 0.0;
             fixed: 1 1;
-            min: 0 ITEM_HEIGHT;
+            min: 0 EX_ITEM_HEIGHT;
             rel1 { relative: 1.0 0.0; to: "elm.rect.pada"; }  //1.0 0.0
             rel2 { relative: 0.0 1.0; to: "elm.rect.padb"; }
             align: 0.5 0.5;
@@ -662,8 +660,8 @@ group { name: "elm/navigationbar_ex/item/topbar_obj_2fns/default";
          scale: 1;
          description {
             fixed: 1 1;
-            min: ITEM_WIDTH ITEM_HEIGHT;
-            max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+            min: ITEM_WIDTH EX_ITEM_HEIGHT;
+            max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 0.0 0.0; to: "elm.rect.pad2"; }
             rel2 { relative: 0.0 1.0; to: "elm.rect.pad2"; }
@@ -693,8 +691,8 @@ group { name: "elm/navigationbar_ex/item/topbar_obj_2fns/default";
          scale: 1;
          description {
             fixed: 1 1;
-            min: ITEM_WIDTH ITEM_HEIGHT;
-            max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+            min: ITEM_WIDTH EX_ITEM_HEIGHT;
+            max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.pad1"; }
             rel2 { relative: 1.0 1.0; to: "elm.rect.pad1"; }
@@ -794,8 +792,8 @@ group { name: "elm/navigationbar_ex/item/topbar_3fns/default";
          scale: 1;
          description {
             fixed: 1 1;
-            min: ITEM_WIDTH ITEM_HEIGHT;
-            max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+            min: ITEM_WIDTH EX_ITEM_HEIGHT;
+            max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 0.0 0.0; to: "elm.rect.pad3"; }
             rel2 { relative: 0.0 1.0; to: "elm.rect.pad3"; }
@@ -825,8 +823,8 @@ group { name: "elm/navigationbar_ex/item/topbar_3fns/default";
          scale: 1;
          description {
             fixed: 1 1;
-            min: ITEM_WIDTH ITEM_HEIGHT;
-            max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+            min: ITEM_WIDTH EX_ITEM_HEIGHT;
+            max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 0.0 0.0; to: "elm.rect.pad2"; }
             rel2 { relative: 0.0 1.0; to: "elm.rect.pad2"; }
@@ -872,8 +870,8 @@ group { name: "elm/navigationbar_ex/item/topbar_3fns/default";
          scale: 1;
          description {
             fixed: 1 1;
-            min: ITEM_WIDTH ITEM_HEIGHT;
-            max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+            min: ITEM_WIDTH EX_ITEM_HEIGHT;
+            max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.pad1"; }
             rel2 { relative: 1.0 1.0; to: "elm.rect.pad1"; }
@@ -939,7 +937,7 @@ group { name: "elm/navigationbar_ex/item/topbar_obj_3fns/default";
          description {
             state: "default" 0.0;
             fixed: 0 1;
-            min: 0 ITEM_HEIGHT;
+            min: 0 EX_ITEM_HEIGHT;
             rel1 { relative: 1.0 0.0; to: "elm.rect.pad5"; }  //1.0 0.0
             rel2 { relative: 0.0 1.0; to: "elm.rect.pad4"; }    
             align: 0.0 0.5;
@@ -968,8 +966,8 @@ group { name: "elm/navigationbar_ex/item/topbar_obj_3fns/default";
          scale: 1;
          description {
             fixed: 1 1;
-            min: ITEM_WIDTH ITEM_HEIGHT;
-            max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+            min: ITEM_WIDTH EX_ITEM_HEIGHT;
+            max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 0.0 0.0; to: "elm.rect.pad3"; }
             rel2 { relative: 0.0 1.0; to: "elm.rect.pad3"; }
@@ -999,8 +997,8 @@ group { name: "elm/navigationbar_ex/item/topbar_obj_3fns/default";
          scale: 1;
          description {
             fixed: 1 1;
-            min: ITEM_WIDTH ITEM_HEIGHT;
-            max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+            min: ITEM_WIDTH EX_ITEM_HEIGHT;
+            max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 0.0 0.0; to: "elm.rect.pad2"; }
             rel2 { relative: 0.0 1.0; to: "elm.rect.pad2"; }
@@ -1046,8 +1044,8 @@ group { name: "elm/navigationbar_ex/item/topbar_obj_3fns/default";
          scale: 1;
          description {
             fixed: 1 1;
-            min: ITEM_WIDTH ITEM_HEIGHT;
-            max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+            min: ITEM_WIDTH EX_ITEM_HEIGHT;
+            max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.pad1"; }
             rel2 { relative: 1.0 1.0; to: "elm.rect.pad1"; }
@@ -1133,8 +1131,8 @@ parts {
       scale: 1;
       description {
          fixed: 1 1;
-         min: ITEM_WIDTH ITEM_HEIGHT;
-         max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+         min: ITEM_WIDTH EX_ITEM_HEIGHT;
+         max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
          state: "default" 0.0;
          rel1 { relative: 0.0 0.0; to: "elm.rect.pad2"; }
          rel2 { relative: 0.0 1.0; to: "elm.rect.pad2"; }
@@ -1164,8 +1162,8 @@ parts {
       scale: 1;
       description {
          fixed: 1 1;
-         min: ITEM_WIDTH ITEM_HEIGHT;
-         max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+         min: ITEM_WIDTH EX_ITEM_HEIGHT;
+         max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
          state: "default" 0.0;
          rel1 { relative: 0.0 0.0; to: "elm.rect.pad1"; }
          rel2 { relative: 0.0 1.0; to: "elm.rect.pad1"; }
@@ -1276,7 +1274,7 @@ group { name: "elm/navigationbar_ex/item/topbar_seg_full/default";
          clip_to: "clip_title";
          description {
             fixed: 1 1;
-            min: 0 ITEM_HEIGHT;
+            min: 0 EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.pad1"; }  //1.0 0.0
             rel2 { relative: 0.0 1.0; to: "elm.rect.pad2"; }
@@ -1339,7 +1337,7 @@ group { name: "elm/navigationbar_ex/item/topbar_search/default";
          clip_to: "clip_title";
          description {
             fixed: 1 1;
-            min: 0 ITEM_HEIGHT;
+            min: 0 EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.pad1"; }  //1.0 0.0
             rel2 { relative: 0.0 1.0; to: "elm.rect.pad2"; }
@@ -1369,8 +1367,8 @@ group { name: "elm/navigationbar_ex/item/topbar_search/default";
          scale: 1;
          description {
             fixed: 1 1;
-            min: ITEM_WIDTH ITEM_HEIGHT;
-            max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+            min: ITEM_WIDTH EX_ITEM_HEIGHT;
+            max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 0.0 0.0; to: "elm.rect.pad3"; }
             rel2 { relative: 0.0 1.0; to: "elm.rect.pad3"; }
@@ -1667,8 +1665,8 @@ group { name: "elm/navigationbar_ex/item/topbar_back_1fn/default";
          scale: 1;
          description {
             fixed: 1 1;
-            min: ITEM_WIDTH ITEM_HEIGHT;
-            max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+            min: ITEM_WIDTH EX_ITEM_HEIGHT;
+            max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 0.0 0.0; to: "elm.rect.pad1"; }
             rel2 { relative: 0.0 1.0; to: "elm.rect.pad1"; }
@@ -1698,8 +1696,8 @@ group { name: "elm/navigationbar_ex/item/topbar_back_1fn/default";
          scale: 1;
          description {
             fixed: 1 1;
-            min: ITEM_WIDTH ITEM_HEIGHT;
-            max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+            min: ITEM_WIDTH EX_ITEM_HEIGHT;
+            max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.pad2"; }
             rel2 { relative: 1.0 1.0; to: "elm.rect.pad2"; }
@@ -1809,8 +1807,8 @@ group { name: "elm/navigationbar_ex/item/topbar_back_2fns/default";
          scale: 1;
          description {
             fixed: 1 1;
-            min: ITEM_WIDTH ITEM_HEIGHT;
-            max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+            min: ITEM_WIDTH EX_ITEM_HEIGHT;
+            max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 0.0 0.0; to: "elm.rect.pad1"; }
             rel2 { relative: 0.0 1.0; to: "elm.rect.pad1"; }
@@ -1840,8 +1838,8 @@ group { name: "elm/navigationbar_ex/item/topbar_back_2fns/default";
          scale: 1;
          description {
             fixed: 1 1;
-            min: ITEM_WIDTH ITEM_HEIGHT;
-            max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+            min: ITEM_WIDTH EX_ITEM_HEIGHT;
+            max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 0.0 0.0; to: "elm.rect.pad3"; }
             rel2 { relative: 0.0 1.0; to: "elm.rect.pad3"; }
@@ -1887,8 +1885,8 @@ group { name: "elm/navigationbar_ex/item/topbar_back_2fns/default";
          scale: 1;
          description {
             fixed: 1 1;
-            min: ITEM_WIDTH ITEM_HEIGHT;
-            max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+            min: ITEM_WIDTH EX_ITEM_HEIGHT;
+            max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.pad2"; }
             rel2 { relative: 1.0 1.0; to: "elm.rect.pad2"; }
@@ -1955,7 +1953,7 @@ group { name: "elm/navigationbar_ex/item/topbar_back_obj_2fns/default";
          description {
             state: "default" 0.0;
             fixed: 1 1;
-            min: 0 ITEM_HEIGHT;
+            min: 0 EX_ITEM_HEIGHT;
             rel1 { relative: 1.0 0.0; to: "elm.rect.pad5"; }  //1.0 0.0
             rel2 { relative: 0.0 1.0; to: "elm.rect.pad4"; }    
             align: 0.0 0.5;
@@ -1984,8 +1982,8 @@ group { name: "elm/navigationbar_ex/item/topbar_back_obj_2fns/default";
          scale: 1;
          description {
             fixed: 1 1;
-            min: ITEM_WIDTH ITEM_HEIGHT;
-            max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+            min: ITEM_WIDTH EX_ITEM_HEIGHT;
+            max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 0.0 0.0; to: "elm.rect.pad1"; }
             rel2 { relative: 0.0 1.0; to: "elm.rect.pad1"; }
@@ -2015,8 +2013,8 @@ group { name: "elm/navigationbar_ex/item/topbar_back_obj_2fns/default";
          scale: 1;
          description {
             fixed: 1 1;
-            min: ITEM_WIDTH ITEM_HEIGHT;
-            max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+            min: ITEM_WIDTH EX_ITEM_HEIGHT;
+            max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 0.0 0.0; to: "elm.rect.pad3"; }
             rel2 { relative: 0.0 1.0; to: "elm.rect.pad3"; }
@@ -2062,8 +2060,8 @@ group { name: "elm/navigationbar_ex/item/topbar_back_obj_2fns/default";
          scale: 1;
          description {
             fixed: 1 1;
-            min: ITEM_WIDTH ITEM_HEIGHT;
-            max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+            min: ITEM_WIDTH EX_ITEM_HEIGHT;
+            max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.pad2"; }
             rel2 { relative: 1.0 1.0; to: "elm.rect.pad2"; }
@@ -2179,8 +2177,8 @@ group { name: "elm/navigationbar_ex/item/topbar_back_3fns/default";
          scale: 1;
          description {
             fixed: 1 1;
-            min: ITEM_WIDTH ITEM_HEIGHT;
-            max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+            min: ITEM_WIDTH EX_ITEM_HEIGHT;
+            max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 0.0 0.0; to: "elm.rect.pad1"; }
             rel2 { relative: 0.0 1.0; to: "elm.rect.pad1"; }
@@ -2209,8 +2207,8 @@ group { name: "elm/navigationbar_ex/item/topbar_back_3fns/default";
          scale: 1;
          description {
             fixed: 1 1;
-            min: ITEM_WIDTH ITEM_HEIGHT;
-            max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+            min: ITEM_WIDTH EX_ITEM_HEIGHT;
+            max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 0.0 0.0; to: "elm.rect.pad3"; }
             rel2 { relative: 0.0 1.0; to: "elm.rect.pad3"; }
@@ -2240,8 +2238,8 @@ group { name: "elm/navigationbar_ex/item/topbar_back_3fns/default";
          scale: 1;
          description {
             fixed: 1 1;
-            min: ITEM_WIDTH ITEM_HEIGHT;
-            max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+            min: ITEM_WIDTH EX_ITEM_HEIGHT;
+            max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 0.0 0.0; to: "elm.rect.pad4"; }
             rel2 { relative: 0.0 1.0; to: "elm.rect.pad4"; }
@@ -2287,8 +2285,8 @@ group { name: "elm/navigationbar_ex/item/topbar_back_3fns/default";
          scale: 1;
          description {
             fixed: 1 1;
-            min: ITEM_WIDTH ITEM_HEIGHT;
-            max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+            min: ITEM_WIDTH EX_ITEM_HEIGHT;
+            max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.pad2"; }
             rel2 { relative: 1.0 1.0; to: "elm.rect.pad2"; }
@@ -2427,8 +2425,8 @@ group { name: "elm/navigationbar_ex/item/topbar_back_1fn_2lines_facebook/default
          scale: 1;
          description {
             fixed: 1 1;
-            min: ITEM_WIDTH ITEM_HEIGHT;
-            max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+            min: ITEM_WIDTH EX_ITEM_HEIGHT;
+            max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 0.0 0.0; to: "elm.rect.pad1"; }
             rel2 { relative: 0.0 1.0; to: "elm.rect.pad1"; }
@@ -2474,8 +2472,8 @@ group { name: "elm/navigationbar_ex/item/topbar_back_1fn_2lines_facebook/default
          scale: 1;
          description {
             fixed: 1 1;
-            min: ITEM_WIDTH ITEM_HEIGHT;
-            max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+            min: ITEM_WIDTH EX_ITEM_HEIGHT;
+            max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.pad3"; }
             rel2 { relative: 1.0 1.0; to: "elm.rect.pad3"; }
@@ -2596,8 +2594,8 @@ group { name: "elm/navigationbar_ex/item/topbar_back_1fn_2lines_ebook/default";
          scale: 1;
          description {
             fixed: 1 1;
-            min: ITEM_WIDTH ITEM_HEIGHT;
-            max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+            min: ITEM_WIDTH EX_ITEM_HEIGHT;
+            max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 0.0 0.0; to: "elm.rect.pad1"; }
             rel2 { relative: 0.0 1.0; to: "elm.rect.pad1"; }
@@ -2643,8 +2641,8 @@ group { name: "elm/navigationbar_ex/item/topbar_back_1fn_2lines_ebook/default";
          scale: 1;
          description {
             fixed: 1 1;
-            min: ITEM_WIDTH ITEM_HEIGHT;
-            max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+            min: ITEM_WIDTH EX_ITEM_HEIGHT;
+            max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.pad3"; }
             rel2 { relative: 1.0 1.0; to: "elm.rect.pad3"; }
@@ -2763,8 +2761,8 @@ group { name: "elm/navigationbar_ex/item/topbar_back_1fn_2lines/default";
          scale: 1;
          description {
             fixed: 1 1;
-            min: ITEM_WIDTH ITEM_HEIGHT;
-            max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+            min: ITEM_WIDTH EX_ITEM_HEIGHT;
+            max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 0.0 0.0; to: "elm.rect.pad1"; }
             rel2 { relative: 0.0 1.0; to: "elm.rect.pad1"; }
@@ -2810,8 +2808,8 @@ group { name: "elm/navigationbar_ex/item/topbar_back_1fn_2lines/default";
          scale: 1;
          description {
             fixed: 1 1;
-            min: ITEM_WIDTH ITEM_HEIGHT;
-            max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+            min: ITEM_WIDTH EX_ITEM_HEIGHT;
+            max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.pad3"; }
             rel2 { relative: 1.0 1.0; to: "elm.rect.pad3"; }
@@ -2897,8 +2895,8 @@ group { name: "elm/navigationbar_ex/item/topbar_title_segmented_1fn/default";
          scale: 1;
          description {
             fixed: 1 1;
-            min: ITEM_WIDTH ITEM_HEIGHT;
-            max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+            min: ITEM_WIDTH EX_ITEM_HEIGHT;
+            max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.pad1"; }
             rel2 { relative: 1.0 1.0; to: "elm.rect.pad1"; }
@@ -2944,8 +2942,8 @@ group { name: "elm/navigationbar_ex/item/topbar_title_segmented_1fn/default";
          scale: 1;
          description {
             fixed: 1 1;
-            min: ITEM_WIDTH ITEM_HEIGHT;
-            max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+            min: ITEM_WIDTH EX_ITEM_HEIGHT;
+            max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 0.0 0.0; to: "elm.rect.pad3"; }
             rel2 { relative: 0.0 1.0; to: "elm.rect.pad3"; }
@@ -2975,7 +2973,7 @@ group { name: "elm/navigationbar_ex/item/topbar_title_segmented_1fn/default";
          clip_to: "clip_title"; 
          description {
             fixed: 1 1;
-            min: 0 ITEM_HEIGHT;
+            min: 0 EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.pad2"; }  //1.0 0.0
             rel2 { relative: 0.0 1.0; to: "elm.rect.pad4"; }
@@ -3044,8 +3042,8 @@ group { name: "elm/navigationbar_ex/item/topbar_title_1fn_segmented/default";
          scale: 1;
          description {
             fixed: 1 1;
-            min: ITEM_WIDTH ITEM_HEIGHT;
-            max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+            min: ITEM_WIDTH EX_ITEM_HEIGHT;
+            max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.pad1"; }
             rel2 { relative: 1.0 0.5; to: "elm.rect.pad1"; }
@@ -3075,8 +3073,8 @@ group { name: "elm/navigationbar_ex/item/topbar_title_1fn_segmented/default";
          scale: 1;
          description {
             fixed: 1 1;
-            min: ITEM_WIDTH ITEM_HEIGHT;
-            max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+            min: ITEM_WIDTH EX_ITEM_HEIGHT;
+            max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 0.0 0.0; to: "elm.rect.pad2"; }
             rel2 { relative: 0.0 0.5; to: "elm.rect.pad2"; }
@@ -3090,7 +3088,7 @@ group { name: "elm/navigationbar_ex/item/topbar_title_1fn_segmented/default";
          clip_to: "clip_title";                 
          description {
             fixed: 1 1;
-            min: 0 ITEM_HEIGHT;
+            min: 0 EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 1.0 0.5; to: "elm.rect.pad1"; }  
             rel2 { relative: 0.0 1.0; to: "elm.rect.pad2"; }
@@ -3137,8 +3135,8 @@ group { name: "elm/navigationbar_ex/item/topbar_ebook_search/default";
          scale: 1;
          description {
             fixed: 1 1;
-            min: 115 ITEM_HEIGHT;
-            max: 115 ITEM_HEIGHT;
+            min: 115 EX_ITEM_HEIGHT;
+            max: 115 EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 0.0 0.0; to: "elm.rect.pad1"; }
             rel2 { relative: 0.0 1.0; to: "elm.rect.pad1"; }
@@ -3150,8 +3148,8 @@ group { name: "elm/navigationbar_ex/item/topbar_ebook_search/default";
          clip_to: "clip_title";
          scale : 1;
          description { state: "default" 0.0;
-            min: ITEM_WIDTH ITEM_HEIGHT;
-            max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+            min: ITEM_WIDTH EX_ITEM_HEIGHT;
+            max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
             fixed : 1 1;
             align: 1.0 0.5;
             rel1 {
@@ -3187,8 +3185,8 @@ group { name: "elm/navigationbar_ex/item/topbar_ebook_search/default";
          clip_to: "clip_title";
          scale : 1;
          description { state: "default" 0.0;
-            min: ITEM_WIDTH ITEM_HEIGHT;
-            max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+            min: ITEM_WIDTH EX_ITEM_HEIGHT;
+            max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
             fixed : 1 1;
             align: 0.5 0.5;
             rel1 {
@@ -3222,8 +3220,8 @@ group { name: "elm/navigationbar_ex/item/topbar_ebook_search/default";
          clip_to: "clip_title";
          scale : 1;
          description { state: "default" 0.0;
-            min: ITEM_WIDTH ITEM_HEIGHT;
-            max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+            min: ITEM_WIDTH EX_ITEM_HEIGHT;
+            max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
             fixed : 1 1;
             align: 0.0 0.5;
             rel1 {
@@ -3259,8 +3257,8 @@ group { name: "elm/navigationbar_ex/item/topbar_ebook_search/default";
          scale: 1;
          description {
             fixed: 1 1;
-            min: ITEM_WIDTH ITEM_HEIGHT;
-            max: MAX_ITEM_WIDTH ITEM_HEIGHT;
+            min: ITEM_WIDTH EX_ITEM_HEIGHT;
+            max: MAX_ITEM_WIDTH EX_ITEM_HEIGHT;
             state: "default" 0.0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.pad2"; }
             rel2 { relative: 1.0 1.0; to: "elm.rect.pad2"; }

diff --git a/themes/nbeat.edc b/themes/nbeat.edc
index a20c164..ef695ba 100644 (file)
--- a/themes/nbeat.edc
+++ b/themes/nbeat.edc
@@ -35,7 +35,7 @@
 #include "inc/tmp-inc.edc"
 
 #define INDICATOR_H            27
-#define NAVI_BAR_H             67
+#define NAVI_BAR_H             55
 #define TAB_BAR_H              86
 #define TOOL_BAR_H             74
 #define SOFTKEY_H              72