[naviframe] Add padding area between maintitle and subtitle

Change-Id: Iab8aa32ef43f8cf909af7c958566b9fb80d75237

diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc
index 1bef5fd..67f7e80 100755 (executable)
--- a/themes/inc/tizen-dark-inc.edc
+++ b/themes/inc/tizen-dark-inc.edc
@@ -26,8 +26,8 @@
 #define LAYOUT_INDICATOR_HEIGHT_INC 60
 #define LAYOUT_INDICATOR_COLOR_INC 0 0 0 255
 
-#define NAVIFRAME_TITLE_TEXT_BG_H_INC 82
-#define NAVIFRAME_LANDSCAPE_TITLE_TEXT_BG_H_INC 72
+#define NAVIFRAME_TITLE_TEXT_BG_H_INC 88
+#define NAVIFRAME_LANDSCAPE_TITLE_TEXT_BG_H_INC 76
 #define NAVIFRAME_TITLE_BG_IMAGE_BORDER_INC 8 8 2 2
 #define NAVIFRAME_TITLE_H_INC 96
 #define NAVIFRAME_LANDSCAPE_TITLE_H_INC 91
@@ -67,8 +67,10 @@
 #define NAVIFRAME_SUBTITLE_TEXT_COLOR_INC 250 250 250 255
 #define NAVIFRAME_SUBTITLE_FONT_SIZE_INC 32
 #define NAVIFRAME_LANDSCAPE_SUBTITLE_FONT_SIZE_INC 28
-#define NAVIFRAME_SUBTITLE_HEIGHT_INC 34
-#define NAVIFRAME_LANDSCAPE_SUBTITLE_HEIGHT_INC 30
+#define NAVIFRAME_SUBTITLE_H_INC 37
+#define NAVIFRAME_LANDSCAPE_SUBTITLE_H_INC 30
+#define NAVIFRAME_SUBTITLE_TOP_PADDING_H_INC 6
+#define NAVIFRAME_LANDSCAPE_SUBTITLE_TOP_PADDING_H_INC 4
 #define NAVIFRAME_TITLE_TEXT_UNSELECTED_COLOR_INC 153 153 153 255
 #define NAVIFRAME_BADGE_TEXT_COLOR_INC 10 100 208 255;
 #define NAVIFRAME_TITLE_BUTTON_DIVIDER_COLOR_INC 255 255 255 82

diff --git a/themes/inc/tizen-light-inc.edc b/themes/inc/tizen-light-inc.edc
index 485df85..243a831 100755 (executable)
--- a/themes/inc/tizen-light-inc.edc
+++ b/themes/inc/tizen-light-inc.edc
@@ -93,8 +93,10 @@
 #define NAVIFRAME_SUBTITLE_TEXT_COLOR_INC 59 115 182 255
 #define NAVIFRAME_SUBTITLE_FONT_SIZE_INC 32
 #define NAVIFRAME_LANDSCAPE_SUBTITLE_FONT_SIZE_INC 28
-#define NAVIFRAME_SUBTITLE_HEIGHT_INC 34
-#define NAVIFRAME_LANDSCAPE_SUBTITLE_HEIGHT_INC 30
+#define NAVIFRAME_SUBTITLE_H_INC 34
+#define NAVIFRAME_LANDSCAPE_SUBTITLE_H_INC 30
+#define NAVIFRAME_SUBTITLE_TOP_PADDING_H_INC 6
+#define NAVIFRAME_LANDSCAPE_SUBTITLE_TOP_PADDING_H_INC 4
 #define NAVIFRAME_TITLE_TEXT_UNSELECTED_COLOR_INC 153 153 153 255
 #define NAVIFRAME_BADGE_TEXT_COLOR_INC 10 100 208 255;
 #define NAVIFRAME_DUAL_TITLE_DIVIDER_LEFT_COLOR_INC 211 209 203 255

diff --git a/themes/widgets/naviframe.edc b/themes/widgets/naviframe.edc
index 6089ba7..e94e0c4 100644 (file)
--- a/themes/widgets/naviframe.edc
+++ b/themes/widgets/naviframe.edc
@@ -195,7 +195,7 @@
             description { state: "subtitle_is_set" 0.0;
                inherit: "default" 0.0;
                rel1 { relative: 0.0 0.0; to: "title_text_bg"; }
-               rel2 { relative: 0.0 0.0; to_x: "badge_padding"; to_y: "subtitle_text_bg"; }
+               rel2 { relative: 0.0 0.0; to_x: "badge_padding"; to_y: "subtitle_top_padding"; }
             }
          }
          part { name: "elm.text.title";
@@ -240,6 +240,32 @@
                }
             }
          }
+         part { name: "subtitle_top_padding";
+            type: RECT;
+            scale: 1;
+            repeat_events: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               min: 0 0;
+               max: 0 0;
+               fixed: 1 1;
+               align: 0.5 1.0;
+               rel1 { relative: 0.0 0.0; to: "subtitle_text_bg"; }
+               rel2 { relative: 1.0 0.0; to: "subtitle_text_bg"; }
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               fixed: 0 1;
+               min: 0 NAVIFRAME_SUBTITLE_TOP_PADDING_H_INC;
+               max: -1 NAVIFRAME_SUBTITLE_TOP_PADDING_H_INC;
+            }
+            description { state: "visible_landscape" 0.0;
+               inherit: "default" 0.0;
+               fixed: 0 1;
+               min: 0 NAVIFRAME_LANDSCAPE_SUBTITLE_TOP_PADDING_H_INC;
+               max: -1 NAVIFRAME_LANDSCAPE_SUBTITLE_TOP_PADDING_H_INC;
+            }
+         }
          part { name: "subtitle_text_bg";
             type: RECT;
             scale: 1;
@@ -256,14 +282,14 @@
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
                fixed: 0 1;
-               min: 0 NAVIFRAME_SUBTITLE_HEIGHT_INC;
-               max: -1 NAVIFRAME_SUBTITLE_HEIGHT_INC;
+               min: 0 NAVIFRAME_SUBTITLE_H_INC;
+               max: -1 NAVIFRAME_SUBTITLE_H_INC;
             }
             description { state: "visible_landscape" 0.0;
                inherit: "default" 0.0;
                fixed: 0 1;
-               min: 0 NAVIFRAME_LANDSCAPE_SUBTITLE_HEIGHT_INC;
-               max: -1 NAVIFRAME_LANDSCAPE_SUBTITLE_HEIGHT_INC;
+               min: 0 NAVIFRAME_LANDSCAPE_SUBTITLE_H_INC;
+               max: -1 NAVIFRAME_LANDSCAPE_SUBTITLE_H_INC;
             }
          }
          part { name: "elm.text.subtitle";
@@ -747,10 +773,12 @@
                set_state(PART:"maintitle_text_bg", "subtitle_is_set", 0.0);
                if (get_int(landscape) == 0) {
                   set_state(PART:"elm.text.title", "subtitle_is_set", 0.0);
+                  set_state(PART:"subtitle_top_padding", "visible", 0.0);
                   set_state(PART:"subtitle_text_bg", "visible", 0.0);
                }
                else {
                   set_state(PART:"elm.text.title", "subtitle_is_set_landscape", 0.0);
+                  set_state(PART:"subtitle_top_padding", "visible_landscape", 0.0);
                   set_state(PART:"subtitle_text_bg", "visible_landscape", 0.0);
                }
             }
@@ -760,6 +788,7 @@
             source: "elm";
             script {
                set_state(PART:"maintitle_text_bg", "default", 0.0);
+               set_state(PART:"subtitle_top_padding", "default", 0.0);
                set_state(PART:"subtitle_text_bg", "default", 0.0);
                set_state(PART:"elm.text.title", "default", 0.0);
             }
@@ -945,10 +974,14 @@
             source: "elm";
             script {
                set_state(PART:"maintitle_text_bg", "subtitle_is_set", 0.0);
-               if (get_int(landscape) == 0)
+               if (get_int(landscape) == 0) {
+                 set_state(PART:"subtitle_top_padding", "visible", 0.0);
                  set_state(PART:"subtitle_text_bg", "visible", 0.0);
-               else
+               }
+               else {
+                 set_state(PART:"subtitle_top_padding", "visible_landscape", 0.0);
                  set_state(PART:"subtitle_text_bg", "visible_landscape", 0.0);
+               }
             }
          }
          program {
@@ -957,6 +990,7 @@
             source: "elm";
             script {
                set_state(PART:"maintitle_text_bg", "default", 0.0);
+               set_state(PART:"subtitle_top_padding", "default", 0.0);
                set_state(PART:"subtitle_text_bg", "default", 0.0);
             }
          }
@@ -984,6 +1018,10 @@
                   if (!strcmp(st, "subtitle_is_set"))
                     set_state(PART:"elm.text.title", "subtitle_is_set_landscape", 0.0);
 
+                  get_state(PART:"subtitle_top_padding", st, 30, vl);
+                  if (!strcmp(st, "visible"))
+                    set_state(PART:"subtitle_top_padding", "visible_landscape", 0.0);
+
                   get_state(PART:"subtitle_text_bg", st, 30, vl);
                   if (!strcmp(st, "visible"))
                     set_state(PART:"subtitle_text_bg", "visible_landscape", 0.0);
@@ -1020,6 +1058,10 @@
                   if (!strcmp(st, "subtitle_is_set_landscape"))
                     set_state(PART:"elm.text.title", "subtitle_is_set", 0.0);
 
+                  get_state(PART:"subtitle_top_padding", st, 30, vl);
+                  if (!strcmp(st, "visible_landscape"))
+                    set_state(PART:"subtitle_top_padding", "visible", 0.0);
+
                   get_state(PART:"subtitle_text_bg", st, 30, vl);
                   if (!strcmp(st, "visible_landscape"))
                     set_state(PART:"subtitle_text_bg", "visible", 0.0);