From b2ec43b69774be206f76efe52ece37f0de0480db Mon Sep 17 00:00:00 2001 From: "jae_hyun.cho" Date: Fri, 5 Apr 2013 10:31:06 +0900 Subject: [PATCH] [naviframe] UX4.4 Apply bg images to title_bg and toolbar_bg Change-Id: I8f213d7766bc06af914a50983b59bc024d1c5f89 --- themes/images/tizen-hd/00_title_bg.png | Bin 0 -> 2807 bytes themes/images/tizen-hd/00_toolbar_bg.png | Bin 0 -> 2807 bytes themes/inc/tizen-hd-inc.edc | 4 +- themes/widgets/naviframe.edc | 86 ++++++++++++++++++++++++------- 4 files changed, 68 insertions(+), 22 deletions(-) create mode 100755 themes/images/tizen-hd/00_title_bg.png create mode 100755 themes/images/tizen-hd/00_toolbar_bg.png diff --git a/themes/images/tizen-hd/00_title_bg.png b/themes/images/tizen-hd/00_title_bg.png new file mode 100755 index 0000000000000000000000000000000000000000..eef8f3ab7d54b6dbeda912c2846a823334e523a9 GIT binary patch literal 2807 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 JPDHLkV1l&%Gq3;v literal 0 HcmV?d00001 diff --git a/themes/images/tizen-hd/00_toolbar_bg.png b/themes/images/tizen-hd/00_toolbar_bg.png new file mode 100755 index 0000000000000000000000000000000000000000..eef8f3ab7d54b6dbeda912c2846a823334e523a9 GIT binary patch literal 2807 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 JPDHLkV1l&%Gq3;v literal 0 HcmV?d00001 diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc index 436427e..4a1f18e 100644 --- a/themes/inc/tizen-hd-inc.edc +++ b/themes/inc/tizen-hd-inc.edc @@ -28,8 +28,6 @@ #define LAYOUT_INDICATOR_HEIGHT_INC 60 #define LAYOUT_INDICATOR_COLOR_INC 0 0 0 255 -#define NAVIFRAME_TITLE_BG_COLOR_INC 248 246 239 255 -#define NAVIFRAME_TOOLBAR_BG_COLOR_INC 248 246 239 255 #define NAVIFRAME_TITLE_TOP_PADDING_INC 0 32 #define NAVIFRAME_LANDSCAPE_TITLE_TOP_PADDING_INC 0 15 #define NAVIFRAME_TITLE_TOP_PADDING2_INC 0 18 @@ -77,6 +75,8 @@ #define NAVIFRAME_BADGE_TEXT_H_INC 26 #define NAVIFRAME_BADGE_TEXT_W_INC 42 #define NAVIFRAME_BADGE_BG_IMAGE_SIZE_INC 54 48 +#define NAVIFRAME_TITLE_BG_IMAGE_BORDER_INC 8 8 8 8 +#define NAVIFRAME_TOOLBAR_BG_IMAGE_BORDER_INC 8 8 8 8 #define NAVIFRAME_BADGE_BG_IMAGE_BORDER_INC 29 24 0 0 #define NAVIFRAME_TOOLBAR_BUTTON_BG_PADDING_INC 112 0 #define NAVIFRAME_TOOLBAR_BUTTONS_PADDING_INC 16 diff --git a/themes/widgets/naviframe.edc b/themes/widgets/naviframe.edc index 811603e..154be08 100644 --- a/themes/widgets/naviframe.edc +++ b/themes/widgets/naviframe.edc @@ -21,6 +21,8 @@ group { name: "elm/naviframe/item/basic/default"; images { + image: "00_title_bg.png" COMP; + image: "00_toolbar_bg.png" COMP; image: "00_badge_bg.png" COMP; } script { @@ -50,7 +52,6 @@ } } part { name: "title_bg"; - type: RECT; scale: 1; description { state: "default" 0.0; min: 1 NAVIFRAME_TITLE_H_INC; @@ -58,7 +59,11 @@ fixed: 0 1; rel1 { relative: 0.0 0.0; to: "base"; } rel2 { relative: 1.0 0.0; to: "base"; } - color: NAVIFRAME_TITLE_BG_COLOR_INC; + image { + normal: "00_title_bg.png"; + border: NAVIFRAME_TITLE_BG_IMAGE_BORDER_INC; + border_scale: 1; + } } description { state: "landscape" 0.0; inherit: "default" 0.0; @@ -578,7 +583,6 @@ } } part { name: "toolbar_bg"; - type: RECT; scale: 1; description { state: "default" 0.0; min: 0 0; @@ -588,7 +592,11 @@ visible: 0; rel1 { to: "base"; } rel2 { to: "base"; } - color: NAVIFRAME_TOOLBAR_BG_COLOR_INC; + image { + normal: "00_toolbar_bg.png"; + border: NAVIFRAME_TOOLBAR_BG_IMAGE_BORDER_INC; + border_scale: 1; + } } description { state: "visible" 0.0; inherit: "default" 0.0; @@ -1191,6 +1199,10 @@ } group { name: "elm/naviframe/item/tabbar/default"; + images { + image: "00_title_bg.png" COMP; + image: "00_toolbar_bg.png" COMP; + } script { public tbar_bg = 0; //Controlbar BG Show call count public toolbar_buttons_visible = 0; //when both toolbar buttons are visible @@ -1216,7 +1228,6 @@ } } part { name: "title_bg"; - type: RECT; scale: 1; description { state: "default" 0.0; min: 1 NAVIFRAME_TAB_TITLE_H_INC; @@ -1224,7 +1235,11 @@ fixed: 0 1; rel1 { relative: 0.0 0.0; to: "base"; } rel2 { relative: 1.0 0.0; to: "base"; } - color: NAVIFRAME_TITLE_BG_COLOR_INC; + image { + normal: "00_title_bg.png"; + border: NAVIFRAME_TITLE_BG_IMAGE_BORDER_INC; + border_scale: 1; + } } description { state: "landscape" 0.0; inherit: "default" 0.0; @@ -1429,7 +1444,6 @@ } } part { name: "toolbar_bg"; - type: RECT; scale: 1; description { state: "default" 0.0; min: 0 0; @@ -1439,7 +1453,11 @@ visible: 0; rel1 { to: "base"; } rel2 { to: "base"; } - color: NAVIFRAME_TOOLBAR_BG_COLOR_INC; + image { + normal: "00_toolbar_bg.png"; + border: NAVIFRAME_TOOLBAR_BG_IMAGE_BORDER_INC; + border_scale: 1; + } } description { state: "visible" 0.0; inherit: "default" 0.0; @@ -1910,6 +1928,10 @@ } group { name: "elm/naviframe/item/tabbar/notitle/default"; + images { + image: "00_title_bg.png" COMP; + image: "00_toolbar_bg.png" COMP; + } script { public tbar_bg = 0; //Toolbar BG Show call count public toolbar_buttons_visible = 0; //when both toolbar buttons are visible @@ -1935,7 +1957,6 @@ } } part { name: "title_bg"; - type: RECT; scale: 1; description { state: "default" 0.0; min: 1 NAVIFRAME_TITLE_H_INC; @@ -1943,7 +1964,11 @@ fixed: 0 1; rel1 { relative: 0.0 0.0; to: "base"; } rel2 { relative: 1.0 0.0; to: "base"; } - color: NAVIFRAME_TITLE_BG_COLOR_INC; + image { + normal: "00_title_bg.png"; + border: NAVIFRAME_TITLE_BG_IMAGE_BORDER_INC; + border_scale: 1; + } } description { state: "landscape" 0.0; inherit: "default" 0.0; @@ -2011,7 +2036,6 @@ } } part { name: "toolbar_bg"; - type: RECT; scale: 1; description { state: "default" 0.0; min: 0 0; @@ -2021,7 +2045,11 @@ visible: 0; rel1 { to: "base"; } rel2 { to: "base"; } - color: NAVIFRAME_TOOLBAR_BG_COLOR_INC; + image { + normal: "00_toolbar_bg.png"; + border: NAVIFRAME_TOOLBAR_BG_IMAGE_BORDER_INC; + border_scale: 1; + } } description { state: "visible" 0.0; inherit: "default" 0.0; @@ -2483,6 +2511,10 @@ } group { name: "elm/naviframe/item/empty/default"; + images { + image: "00_title_bg.png" COMP; + image: "00_toolbar_bg.png" COMP; + } script { public tbar_bg = 0; //Toolbar BG Show call count public toolbar_buttons_visible = 0; //when both toolbar buttons are visible @@ -2508,12 +2540,15 @@ } } part { name: "title_bg"; - type: RECT; scale: 1; description { state: "default" 0.0; rel1 { to: "title"; } rel2 { to: "title"; } - color: NAVIFRAME_TITLE_BG_COLOR_INC; + image { + normal: "00_title_bg.png"; + border: NAVIFRAME_TITLE_BG_IMAGE_BORDER_INC; + border_scale: 1; + } } description { state: "hide" 0.0; inherit: "default" 0.0; @@ -2567,7 +2602,6 @@ } } part { name: "toolbar_bg"; - type: RECT; scale: 1; description { state: "default" 0.0; min: 0 0; @@ -2577,7 +2611,11 @@ visible: 0; rel1 { to: "base"; } rel2 { to: "base"; } - color: NAVIFRAME_TOOLBAR_BG_COLOR_INC; + image { + normal: "00_toolbar_bg.png"; + border: NAVIFRAME_TOOLBAR_BG_IMAGE_BORDER_INC; + border_scale: 1; + } } description { state: "visible" 0.0; inherit: "default" 0.0; @@ -3127,6 +3165,8 @@ group { name: "elm/naviframe/item/dual_title/default"; images { + image: "00_title_bg.png" COMP; + image: "00_toolbar_bg.png" COMP; image: "00_badge_bg.png" COMP; image: "00_divider_line.png" COMP; } @@ -3155,7 +3195,6 @@ } } part { name: "title_bg"; - type: RECT; scale: 1; description { state: "default" 0.0; min: 1 NAVIFRAME_TITLE_H_INC; @@ -3163,7 +3202,11 @@ fixed: 0 1; rel1 { relative: 0.0 0.0; to: "base"; } rel2 { relative: 1.0 0.0; to: "base"; } - color: NAVIFRAME_TITLE_BG_COLOR_INC; + image { + normal: "00_title_bg.png"; + border: NAVIFRAME_TITLE_BG_IMAGE_BORDER_INC; + border_scale: 1; + } } description { state: "landscape" 0.0; inherit: "default" 0.0; @@ -3704,7 +3747,6 @@ } } part { name: "toolbar_bg"; - type: RECT; scale: 1; description { state: "default" 0.0; min: 0 0; @@ -3714,7 +3756,11 @@ visible: 0; rel1 { to: "base"; } rel2 { to: "base"; } - color: NAVIFRAME_TOOLBAR_BG_COLOR_INC; + image { + normal: "00_toolbar_bg.png"; + border: NAVIFRAME_TOOLBAR_BG_IMAGE_BORDER_INC; + border_scale: 1; + } } description { state: "visible" 0.0; inherit: "default" 0.0; -- 2.7.4