[naviframe] Fix the height size of the tabbar in no title tabbar style

Change-Id: I884569ad25b5da27fb4a5489e94db17503721b82

diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc
index f577406..9761c85 100644 (file)
--- a/themes/inc/tizen-hd-inc.edc
+++ b/themes/inc/tizen-hd-inc.edc
@@ -50,7 +50,6 @@
 #define NAVIFRAME_PREV_FUNC_BTN_SIZE_INC 86 98
 #define NAVIFRAME_LANDSCAPE_PREV_FUNC_BTN_SIZE_INC 86 85
 #define NAVIFRAME_TITLE_TAB_H_INC 63
-#define NAVIFRAME_TITLE_TAB_LARGE_H_INC 111
 #define NAVIFRAME_TITLE_TAB_FONT_SIZE_INC 44
 #define NAVIFRAME_LANDSCAPE_TITLE_TAB_FONT_SIZE_INC 38
 #define NAVIFRAME_TITLE_TAB_TEXT_H_INC 60

diff --git a/themes/widgets/naviframe.edc b/themes/widgets/naviframe.edc
index f9dbd81..811603e 100644 (file)
--- a/themes/widgets/naviframe.edc
+++ b/themes/widgets/naviframe.edc
@@ -1938,7 +1938,7 @@
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
-               min: 1 NAVIFRAME_TAB_TITLE_H_INC;
+               min: 1 NAVIFRAME_TITLE_H_INC;
                align: 0.0 0.0;
                fixed: 0 1;
                rel1 { relative: 0.0 0.0; to: "base"; }
@@ -1947,7 +1947,7 @@
             }
             description { state: "landscape" 0.0;
                inherit: "default" 0.0;
-               min: 1 NAVIFRAME_LANDSCAPE_TAB_TITLE_H_INC;
+               min: 1 NAVIFRAME_LANDSCAPE_TITLE_H_INC;
             }
             description { state: "hide" 0.0;
                inherit: "default" 0.0;
@@ -1969,6 +1969,14 @@
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
+               max: -1 NAVIFRAME_TITLE_H_INC;
+               rel1.to: "title_bg";
+               rel1.relative: 0.0 0.0;
+               rel2.to: "title_bg";
+               rel2.relative: 1.0 1.0;
+            }
+            description { state: "landscape" 0.0;
+               max: -1 NAVIFRAME_LANDSCAPE_TITLE_H_INC;
                rel1.to: "title_bg";
                rel1.relative: 0.0 0.0;
                rel2.to: "title_bg";
@@ -2411,6 +2419,10 @@
                   if (!strcmp(st, "default"))
                     set_state(PART:"title_bg", "landscape", 0.0);
 
+                  get_state(PART:"tabbar", st, 30, vl);
+                  if (!strcmp(st, "default"))
+                    set_state(PART:"tabbar", "landscape", 0.0);
+
                   get_state(PART:"toolbar_bg", st, 30, vl);
                   if (!strcmp(st, "visible"))
                     set_state(PART:"toolbar_bg", "visible_landscape", 0.0);
@@ -2439,6 +2451,10 @@
                   if (!strcmp(st, "landscape"))
                     set_state(PART:"title_bg", "default", 0.0);
 
+                  get_state(PART:"tabbar", st, 30, vl);
+                  if (!strcmp(st, "landscape"))
+                    set_state(PART:"tabbar", "default", 0.0);
+
                   set_int(landscape, 0);
                }
             }