[naviframe] Apply dark theme badge in naviframe title

Change-Id: I0459913390ca7c8c4fa6c7152ce03f7ae615b469

diff --git a/themes/images/HD/dark/Naviframe/00_badge_bg.png b/themes/images/HD/dark/Naviframe/00_badge_bg.png
old mode 100644 (file)
new mode 100755 (executable)
index a04eed3..fe1bf40
Binary files a/themes/images/HD/dark/Naviframe/00_badge_bg.png and b/themes/images/HD/dark/Naviframe/00_badge_bg.png differ

diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc
index 5b3badd..7123bcf 100755 (executable)
--- a/themes/inc/tizen-dark-inc.edc
+++ b/themes/inc/tizen-dark-inc.edc
@@ -53,13 +53,15 @@
 #define NAVIFRAME_ICON_SIZE_INC 45 45
 #define NAVIFRAME_PADDING_INC 26 0
 #define NAVIFRAME_PADDING2_INC 16 0
-#define NAVIFRAME_PADDING_BADGE_INC 2 0
-#define NAVIFRAME_BADGE_PADDING_INC 85 0
-#define NAVIFRAME_BADGE_TOP_PADDING_INC 0 3
-#define NAVIFRAME_BADGE_TEXT_H_INC 26
-#define NAVIFRAME_BADGE_TEXT_W_INC 42
+#define NAVIFRAME_BADGE_PADDING_INC 92 0
+#define NAVIFRAME_BADGE_LEFT_PADDING_INC 8 0
+#define NAVIFRAME_BADGE_TOP_PADDING_INC 0 10
+#define NAVIFRAME_BADGE_TEXT_LEFT_PADDING_INC 12 54
+#define NAVIFRAME_BADGE_TEXT_H_INC 34
+#define NAVIFRAME_BADGE_TEXT_MIN_W_INC 30
+#define NAVIFRAME_BADGE_TEXT_MAX_W_INC 60
 #define NAVIFRAME_BADGE_BG_IMAGE_SIZE_INC 54 54
-#define NAVIFRAME_BADGE_BG_IMAGE_BORDER_INC 29 24 0 0
+#define NAVIFRAME_BADGE_BG_IMAGE_BORDER_INC 27 26 0 0
 #define NAVIFRAME_TOOLBAR_BUTTON_BG_PADDING_INC 112 0
 #define NAVIFRAME_ICON_PADDING_INC 77 0
 #define NAVIFRAME_TITLE_TEXT_COLOR_INC 250 250 250 255
@@ -72,7 +74,7 @@
 #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_BADGE_TEXT_COLOR_INC 250 250 250 255;
 #define NAVIFRAME_TITLE_BUTTON_DIVIDER_COLOR_INC 255 255 255 82
 
 #define PROGRESSBAR_TITLE_FONT_SIZE_INC 28

diff --git a/themes/inc/tizen-light-inc.edc b/themes/inc/tizen-light-inc.edc
index 398871d..9376611 100755 (executable)
--- a/themes/inc/tizen-light-inc.edc
+++ b/themes/inc/tizen-light-inc.edc
@@ -70,7 +70,6 @@
 #define NAVIFRAME_PADDING_INC 16 0
 #define NAVIFRAME_LANDSCAPE_PADDING_INC 34 0
 #define NAVIFRAME_PADDING2_INC 9 0
-#define NAVIFRAME_PADDING_BADGE_INC 2 0
 #define NAVIFRAME_PADDING3_INC 8 0
 #define NAVIFRAME_MIDDLE_PADDING_INC 0 12
 #define NAVIFRAME_BOTTOM_TEXT_PADDING_INC 0 11
@@ -78,10 +77,12 @@
 #define NAVIFRAME_BOTTOM_PADDING_INC 0 12
 #define NAVIFRAME_LANDSCAPE_BOTTOM_PADDING_INC 0 5
 #define NAVIFRAME_BADGE_PADDING_INC 85 0
+#define NAVIFRAME_BADGE_LEFT_PADDING_INC 8 0
 #define NAVIFRAME_BADGE_TOP_PADDING_INC 0 3
-#define NAVIFRAME_BADGE_LEFT_TEXT_PADDING_INC 10 0
+#define NAVIFRAME_BADGE_TEXT_LEFT_PADDING_INC 12 54
 #define NAVIFRAME_BADGE_TEXT_H_INC 26
-#define NAVIFRAME_BADGE_TEXT_W_INC 42
+#define NAVIFRAME_BADGE_TEXT_MIN_W_INC 30
+#define NAVIFRAME_BADGE_TEXT_MAX_W_INC 60
 #define NAVIFRAME_BADGE_BG_IMAGE_SIZE_INC 54 54
 #define NAVIFRAME_BADGE_BG_IMAGE_BORDER_INC 29 24 0 0
 #define NAVIFRAME_TOOLBAR_BUTTON_BG_PADDING_INC 112 0

diff --git a/themes/widgets/naviframe.edc b/themes/widgets/naviframe.edc
index b342773..e66aa92 100644 (file)
--- a/themes/widgets/naviframe.edc
+++ b/themes/widgets/naviframe.edc
@@ -99,15 +99,19 @@
             type: RECT;
             mouse_events: 0;
             scale: 1;
-            description {
-               state: "default" 0.0;
+            description { state: "default" 0.0;
                min: NAVIFRAME_PADDING_INC;
                fixed: 1 0;
                align: 1.0 0.0;
-               rel1 { relative: 1.0 0.0; to: "title_bg"; }
-               rel2 { relative: 1.0 1.0; to: "title_bg"; }
+               rel1 { relative: 1.0 0.0; to: "divider2"; }
+               rel2 { relative: 1.0 1.0; to: "divider2"; }
                visible: 0;
             }
+            description { state: "title_left_btn_set" 0.0;
+               inherit: "default" 0.0;
+               rel1 { relative: 1.0 0.0; to: "divider1"; }
+               rel2 { relative: 1.0 1.0; to: "divider1"; }
+            }
          }
          part { name: "title_left_padding";
             type: RECT;
@@ -158,8 +162,8 @@
                min: 0 0;
                fixed: 1 0;
                align: 1.0 0.0;
-               rel1 { relative: 0.0 0.0; to: "divider1"; }
-               rel2 { relative: 0.0 1.0; to: "divider1"; }
+               rel1 { relative: 0.0 0.0; to: "title_right_padding"; }
+               rel2 { relative: 0.0 1.0; to: "title_right_padding"; }
                visible: 0;
             }
             description { state: "visible" 0.0;
@@ -176,9 +180,9 @@
                max: -1 NAVIFRAME_TITLE_TEXT_BG_H_INC;
                fixed: 0 1;
                rel1 { relative: 1.0 0.0; to_x: "title_left_padding"; to_y: "title_bg"; }
-               rel2 { relative: 0.0 1.0; to_x: "divider1"; to_y: "title_bg"; }
+               rel2 { relative: 0.0 1.0; to_x: "title_right_padding"; to_y: "title_bg"; }
             }
-            description { state: "landscape" 0.0;
+            description { state: "subtitle_is_set" 0.0;
                inherit: "default" 0.0;
                min: 0 NAVIFRAME_LANDSCAPE_TITLE_TEXT_BG_H_INC;
                max: -1 NAVIFRAME_LANDSCAPE_TITLE_TEXT_BG_H_INC;
@@ -344,6 +348,11 @@
                rel2 { relative: 1.0 0.0; to: "title_bg"; }
                align: 0.0 0.0;
             }
+            description { state: "subtitle_is_set" 0.0;
+               inherit: "default" 0.0;
+               min: 0 0;
+               fixed: 0 1;
+            }
          }
          part { name: "badge_left_padding";
             type: RECT;
@@ -358,7 +367,7 @@
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
-               min: NAVIFRAME_PADDING_BADGE_INC;
+               min: NAVIFRAME_BADGE_LEFT_PADDING_INC;
             }
             description { state: "title_slide_is_set" 0.0;
                inherit: "visible" 0.0;
@@ -387,7 +396,7 @@
             description {
                state: "visible" 0.0;
                inherit: "default" 0.0;
-               min: 23 54;
+               min: NAVIFRAME_BADGE_TEXT_LEFT_PADDING_INC;
             }
          }
          part { name: "right.padding.text";
@@ -411,7 +420,7 @@
             description {
                state: "visible" 0.0;
                inherit: "default" 0.0;
-               min: 18 54;
+               min: NAVIFRAME_BADGE_TEXT_LEFT_PADDING_INC;
             }
          }
          part { name: "badge_bg";
@@ -449,7 +458,8 @@
             clip_to: "title_clip";
             description { state: "default" 0.0;
                visible: 0;
-               max: NAVIFRAME_BADGE_TEXT_W_INC -1;
+               min: NAVIFRAME_BADGE_TEXT_MIN_W_INC 0;
+               max: NAVIFRAME_BADGE_TEXT_MAX_W_INC -1;
                fixed: 1 0;
                rel1 { relative: 1.0 0.0; to: "left.padding.text"; }
                rel2 { relative: 1.0 1.0; to_y: "left.padding.text"; to_x: "badge_padding"; }
@@ -770,6 +780,7 @@
             signal: "elm,state,subtitle,show";
             source: "elm";
             script {
+               set_state(PART:"badge_top_padding", "subtitle_is_set", 0.0);
                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);
@@ -787,6 +798,7 @@
             signal: "elm,state,subtitle,hide";
             source: "elm";
             script {
+               set_state(PART:"badge_top_padding", "default", 0.0);
                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);
@@ -808,14 +820,18 @@
          program { name: "title_left_btn_show";
             signal: "elm,state,title_left_btn,show";
             source: "elm";
-            action: STATE_SET "visible" 0.0;
-            target: "divider1";
+            script {
+               set_state(PART:"divider1", "visible", 0.0);
+               set_state(PART:"title_right_padding", "title_left_btn_set", 0.0);
+            }
          }
          program { name: "title_left_btn_hide";
             signal: "elm,state,title_left_btn,hide";
             source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "divider1";
+            script {
+               set_state(PART:"divider1", "default", 0.0);
+               set_state(PART:"title_right_padding", "default", 0.0);
+            }
          }
          program { name: "title_right_btn_show";
             signal: "elm,state,title_right_btn,show";
@@ -973,6 +989,7 @@
             signal: "elm,state,elm.swallow.subtitle,show";
             source: "elm";
             script {
+               set_state(PART:"badge_top_padding", "subtitle_is_set", 0.0);
                set_state(PART:"maintitle_text_bg", "subtitle_is_set", 0.0);
                if (get_int(landscape) == 0) {
                  set_state(PART:"subtitle_top_padding", "visible", 0.0);
@@ -989,6 +1006,7 @@
             signal: "elm,state,elm.swallow.subtitle,hide";
             source: "elm";
             script {
+               set_state(PART:"badge_top_padding", "default", 0.0);
                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);