From 0a28d98f2489e399bfeb8b42b1e2ab847a6952c8 Mon Sep 17 00:00:00 2001 From: Jaehyun Cho Date: Fri, 14 Jun 2013 15:54:41 +0900 Subject: [PATCH] [naviframe] Apply dark theme badge in naviframe title Change-Id: I0459913390ca7c8c4fa6c7152ce03f7ae615b469 --- themes/images/HD/dark/Naviframe/00_badge_bg.png | Bin 5404 -> 4264 bytes themes/inc/tizen-dark-inc.edc | 16 ++++---- themes/inc/tizen-light-inc.edc | 7 ++-- themes/widgets/naviframe.edc | 50 ++++++++++++++++-------- 4 files changed, 47 insertions(+), 26 deletions(-) mode change 100644 => 100755 themes/images/HD/dark/Naviframe/00_badge_bg.png 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 new mode 100755 index a04eed302a141007bb2b967f47f062308857351a..fe1bf40dca2c1913d6be8d4b330a48b8f55d559f GIT binary patch delta 1532 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 diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc index 5b3badd..7123bcf 100755 --- 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 --- 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 --- 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); -- 2.7.4