From: Hosang Kim Date: Fri, 28 Jun 2013 06:21:05 +0000 (+0900) Subject: [toolbar] fixed toolbar theme for applying theme ver 0.9 X-Git-Tag: submit/tizen/20131004.114939~49 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5f1b247b17803700afcc48165f215bc8587ef033;p=platform%2Fcore%2Fuifw%2Fefl-theme-tizen.git [toolbar] fixed toolbar theme for applying theme ver 0.9 Change-Id: I95079df780883d0c168dcc567bd76bf5a1aa0496 --- diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc index 554a801..00ac45b 100755 --- a/themes/inc/tizen-dark-inc.edc +++ b/themes/inc/tizen-dark-inc.edc @@ -354,7 +354,6 @@ #define BUTTON_SEARCH_BUTTON_TEXTBLOCK_SHADOW_NORMAL_COLOR_INC "#000000C0" #define BUTTON_SEARCH_BUTTON_TEXTBLOCK_SHADOW_PRESSED_COLOR_INC "#000000C0" - #define BUTTON_SEARCH_BUTTON_SEND_NORMAL_COLOR_INC 250 250 250 255 #define BUTTON_SEARCH_BUTTON_SEND_PRESSED_COLOR_INC 250 250 250 255 #define BUTTON_SEARCH_BUTTON_SEND_FOCUSED_COLOR_INC 250 250 250 255 @@ -1146,17 +1145,48 @@ #define SCROLLER_HANDLER_SCROLLBAR_VBAR_RIGHT_BORDER 0 10 10 10 #define TOOLBAR_ITEM_BG_DEFAULT_BORDER_INC 8 8 8 8 -#define TOOLBAR_ITEM_BG_SELECTED_BORDER_INC 8 8 8 8 +#define TOOLBAR_ITEM_BG_PRESSED_BORDER_INC 8 8 8 8 +#define TOOLBAR_ITEM_TAB_FOCUS_BORDER_INC 8 8 8 8 #define TOOLBAR_ITEM_TEXTBLOCK_COLOR_INC "#FAFAFA" +#define TOOLBAR_ITEM_PRESSED_TEXTBLOCK_COLOR_INC "#FAFAFA" +#define TOOLBAR_ITEM_TEXTBLOCK_SHADOW_COLOR_INC "#000000BF" +#define TOOLBAR_ITEM_PRESSED_TEXTBLOCK_SHADOW_COLOR_INC "#000000BF" +#define TOOLBAR_ITEM_ONE_ITEM_PADDING_SIZE 60 +#define TOOLBAR_ITEM_TWO_ITEMS_PADDING_SIZE 40 +#define TOOLBAR_ITEM_THREE_ITEMS_PADDING_SIZE 20 +#define TOOLBAR_ITEM_DIVIDER_SIZE 2 78 +#define TOOLBAR_ITEM_DIVIDER_LEFT_COLOR_INC 255 255 255 51 +#define TOOLBAR_ITEM_DIVIDER_RIGHT_COLOR_INC 255 255 255 51 + +#define TABBAR_ITEM_TAB_SELECT_BAR_BORDER_INC 1 1 1 1 +#define TABBAR_ITEM_TAB_PRESS_BORDER_INC 0 0 8 0 +#define TABBAR_ITEM_TAB_FOCUS_BORDER_INC 8 8 8 8 #define TABBAR_ITEM_TEXTBLOCK_COLOR_INC "#F0F0F0" #define TABBAR_ITEM_SELECTED_TEXTBLOCK_COLOR_INC "#F0F0F0" -#define TABBAR_ITEM_BG_DEFAULT_BORDER_INC 9 9 9 9 +#define TABBAR_ITEM_PRESSED_TEXTBLOCK_COLOR_INC "#F0F0F0" +#define TABBAR_ITEM_TEXTBLOCK_SHADOW_COLOR_INC "#000000" +#define TABBAR_ITEM_PRESSED_TEXTBLOCK_SHADOW_COLOR_INC "#000000" +#define TABBAR_ITEM_DEFAULT_ICON_COLOR_INC 255 255 255 255 +#define TABBAR_ITEM_ICON_COLOR_INC 240 240 240 255 +#define TABBAR_ITEM_SELECTED_ICON_COLOR_INC 240 240 240 255 +#define TABBAR_ITEM_PRESSED_ICON_COLOR_INC 240 240 240 255 +#define TABBAR_ITEM_DISABLED_ICON_COLOR_INC 240 240 240 255 +#define TABBAR_ITEM_ICON_SHADOW_COLOR_INC 0 0 0 255 +#define TABBAR_ITEM_PRESSED_ICON_SHADOW_COLOR_INC 0 0 0 255 +#define TABBAR_ITEM_BG_DEFAULT_BORDER_INC 8 8 35 35 #define TABBAR_ITEM_BG_DEFAULT_VISIBLE_INC 0 #define TABBAR_DEFAULT_HEIGHT_INC 126 #define TABBAR_ICON_TEXT_HEIGHT_INC 126 #define TABBAR_HORIZONTAL_HEIGHT_INC 75 #define TABBAR_HORIZONTAL_ICON_TEXT_HEIGHT_INC 75 #define TABBAR_ITEM_ICON_SIZE_INC 63 63 +#define TABBAR_BADGE_TEXT_COLOR_INC 250 250 250 255 +#define TABBAR_BADGE_BG_IMAGE_BORDER_INC 26 26 0 0 +#define TABBAR_BADGE_ONE_ITEM_PADDING_SIZE 10 10 +#define TABBAR_BADGE_TWO_ITEMS_PADDING_SIZE 6 10 +#define TABBAR_BADGE_THREE_ITEMS_PADDING_SIZE 4 10 +#define TABBAR_ITEM_DIVIDER_SIZE 2 88 +#define TABBAR_ITEM_WITH_TITLE_DIVIDER_SIZE 2 48 #define TABBAR_ITEM_DIVIDER_LEFT_COLOR_INC 255 255 255 82 #define TABBAR_ITEM_DIVIDER_RIGHT_COLOR_INC 255 255 255 82 diff --git a/themes/inc/tizen-light-inc.edc b/themes/inc/tizen-light-inc.edc index 4308147..88be50b 100755 --- a/themes/inc/tizen-light-inc.edc +++ b/themes/inc/tizen-light-inc.edc @@ -1145,17 +1145,48 @@ #define SCROLLER_HANDLER_SCROLLBAR_VBAR_RIGHT_BORDER 0 10 10 10 #define TOOLBAR_ITEM_BG_DEFAULT_BORDER_INC 8 8 8 8 -#define TOOLBAR_ITEM_BG_SELECTED_BORDER_INC 8 8 8 8 +#define TOOLBAR_ITEM_BG_PRESSED_BORDER_INC 8 8 8 8 +#define TOOLBAR_ITEM_TAB_FOCUS_BORDER_INC 8 8 8 8 #define TOOLBAR_ITEM_TEXTBLOCK_COLOR_INC "#3A3A3A" -#define TABBAR_ITEM_TEXTBLOCK_COLOR_INC "#555555" +#define TOOLBAR_ITEM_PRESSED_TEXTBLOCK_COLOR_INC "#FAFAFA" +#define TOOLBAR_ITEM_TEXTBLOCK_SHADOW_COLOR_INC "#FAFAFA" +#define TOOLBAR_ITEM_PRESSED_TEXTBLOCK_SHADOW_COLOR_INC "#000000" +#define TOOLBAR_ITEM_ONE_ITEM_PADDING_SIZE 60 +#define TOOLBAR_ITEM_TWO_ITEMS_PADDING_SIZE 40 +#define TOOLBAR_ITEM_THREE_ITEMS_PADDING_SIZE 20 +#define TOOLBAR_ITEM_DIVIDER_SIZE 2 78 +#define TOOLBAR_ITEM_DIVIDER_LEFT_COLOR_INC 140 140 140 255 +#define TOOLBAR_ITEM_DIVIDER_RIGHT_COLOR_INC 140 140 140 255 + +#define TABBAR_ITEM_TAB_SELECT_BAR_BORDER_INC 1 1 1 1 +#define TABBAR_ITEM_TAB_PRESS_BORDER_INC 0 0 8 0 +#define TABBAR_ITEM_TAB_FOCUS_BORDER_INC 8 8 8 8 +#define TABBAR_ITEM_TEXTBLOCK_COLOR_INC "#282828" #define TABBAR_ITEM_SELECTED_TEXTBLOCK_COLOR_INC "#0E68AD" -#define TABBAR_ITEM_BG_DEFAULT_BORDER_INC 9 9 9 9 +#define TABBAR_ITEM_PRESSED_TEXTBLOCK_COLOR_INC "#FAFAFA" +#define TABBAR_ITEM_TEXTBLOCK_SHADOW_COLOR_INC "#FAFAFA" +#define TABBAR_ITEM_PRESSED_TEXTBLOCK_SHADOW_COLOR_INC "#000000" +#define TABBAR_ITEM_DEFAULT_ICON_COLOR_INC 255 255 255 255 +#define TABBAR_ITEM_ICON_COLOR_INC 40 40 40 255 +#define TABBAR_ITEM_SELECTED_ICON_COLOR_INC 14 104 173 255 +#define TABBAR_ITEM_PRESSED_ICON_COLOR_INC 250 250 250 255 +#define TABBAR_ITEM_DISABLED_ICON_COLOR_INC 85 85 85 255 +#define TABBAR_ITEM_ICON_SHADOW_COLOR_INC 250 250 250 255 +#define TABBAR_ITEM_PRESSED_ICON_SHADOW_COLOR_INC 0 0 0 255 +#define TABBAR_ITEM_BG_DEFAULT_BORDER_INC 8 8 35 35 #define TABBAR_ITEM_BG_DEFAULT_VISIBLE_INC 0 #define TABBAR_DEFAULT_HEIGHT_INC 126 #define TABBAR_ICON_TEXT_HEIGHT_INC 126 #define TABBAR_HORIZONTAL_HEIGHT_INC 75 #define TABBAR_HORIZONTAL_ICON_TEXT_HEIGHT_INC 75 #define TABBAR_ITEM_ICON_SIZE_INC 63 63 +#define TABBAR_BADGE_TEXT_COLOR_INC 250 250 250 255 +#define TABBAR_BADGE_BG_IMAGE_BORDER_INC 26 26 0 0 +#define TABBAR_BADGE_ONE_ITEM_PADDING_SIZE 10 10 +#define TABBAR_BADGE_TWO_ITEMS_PADDING_SIZE 6 10 +#define TABBAR_BADGE_THREE_ITEMS_PADDING_SIZE 4 10 +#define TABBAR_ITEM_DIVIDER_SIZE 2 88 +#define TABBAR_ITEM_WITH_TITLE_DIVIDER_SIZE 2 48 #define TABBAR_ITEM_DIVIDER_LEFT_COLOR_INC 138 138 138 255 #define TABBAR_ITEM_DIVIDER_RIGHT_COLOR_INC 138 138 138 255 diff --git a/themes/widgets/toolbar.edc b/themes/widgets/toolbar.edc index 47f479b..316f82a 100644 --- a/themes/widgets/toolbar.edc +++ b/themes/widgets/toolbar.edc @@ -26,7 +26,17 @@ #define TOOLBAR_TEXT_STYLE(_font_size) \ style { name: "toolbar_text_style_"_font_size; \ - base: "font=Tizen:style=Bold style=far_shadow,bottom shadow_color=#000000be font_size="_font_size" align=center color="TOOLBAR_ITEM_TEXTBLOCK_COLOR_INC" wrap=word ellipsis=1 text_class=tizen linegap=0"; \ + base: "font=Tizen:style=Bold style=far_shadow,bottom shadow_color="TOOLBAR_ITEM_TEXTBLOCK_SHADOW_COLOR_INC" font_size="_font_size" align=center color="TOOLBAR_ITEM_TEXTBLOCK_COLOR_INC" wrap=word ellipsis=1 text_class=tizen linegap=0"; \ + tag: "br" "\n"; \ + tag: "ps" "ps"; \ + tag: "hilight" "+ font=Tizen:style=Bold"; \ + tag: "b" "+ font=Tizen:style=Bold"; \ + tag: "tab" "\t"; \ + } + +#define TOOLBAR_PRESSED_TEXT_STYLE(_font_size) \ + style { name: "toolbar_pressed_text_style_"_font_size; \ + base: "font=Tizen:style=Bold style=far_shadow,bottom shadow_color="TOOLBAR_ITEM_PRESSED_TEXTBLOCK_SHADOW_COLOR_INC" font_size="_font_size" align=center color="TOOLBAR_ITEM_PRESSED_TEXTBLOCK_COLOR_INC" wrap=word ellipsis=1 text_class=tizen linegap=0"; \ tag: "br" "\n"; \ tag: "ps" "ps"; \ tag: "hilight" "+ font=Tizen:style=Bold"; \ @@ -36,7 +46,7 @@ #define TABBAR_TEXT_STYLE(_font_size) \ style { name: "tabbar_text_style_"_font_size; \ - base: "font=Tizen:style=Bold style=far_shadow,bottom shadow_color=#000000ff font_size="_font_size" align=center color="TABBAR_ITEM_TEXTBLOCK_COLOR_INC" wrap=word ellipsis=1 text_class=tizen linegap=0"; \ + base: "font=Tizen:style=Bold style=far_shadow,bottom shadow_color="TABBAR_ITEM_TEXTBLOCK_SHADOW_COLOR_INC" font_size="_font_size" align=center color="TABBAR_ITEM_TEXTBLOCK_COLOR_INC" wrap=word ellipsis=1 text_class=tizen linegap=0"; \ tag: "br" "\n"; \ tag: "ps" "ps"; \ tag: "hilight" "+ font=Tizen:style=Bold"; \ @@ -44,9 +54,19 @@ tag: "tab" "\t"; \ } -#define TOOLBAR_SELECTED_TEXT_STYLE(_font_size) \ - style { name: "toolbar_selected_text_style_"_font_size; \ - base: "font=Tizen:style=Bold style=far_shadow,bottom shadow_color=#000000ff font_size="_font_size" align=center color="TABBAR_ITEM_SELECTED_TEXTBLOCK_COLOR_INC" wrap=word ellipsis=1 text_class=tizen linegap=0"; \ +#define TABBAR_SELECTED_TEXT_STYLE(_font_size) \ + style { name: "tabbar_selected_text_style_"_font_size; \ + base: "font=Tizen:style=Bold style=far_shadow,bottom shadow_color="TABBAR_ITEM_TEXTBLOCK_SHADOW_COLOR_INC" font_size="_font_size" align=center color="TABBAR_ITEM_SELECTED_TEXTBLOCK_COLOR_INC" wrap=word ellipsis=1 text_class=tizen linegap=0"; \ + tag: "br" "\n"; \ + tag: "ps" "ps"; \ + tag: "hilight" "+ font=Tizen:style=Bold"; \ + tag: "b" "+ font=Tizen:style=Bold"; \ + tag: "tab" "\t"; \ + } + +#define TABBAR_PRESSED_TEXT_STYLE(_font_size) \ + style { name: "tabbar_pressed_text_style_"_font_size; \ + base: "font=Tizen:style=Bold style=far_shadow,bottom shadow_color="TABBAR_ITEM_PRESSED_TEXTBLOCK_SHADOW_COLOR_INC" font_size="_font_size" align=center color="TABBAR_ITEM_PRESSED_TEXTBLOCK_COLOR_INC" wrap=word ellipsis=1 text_class=tizen linegap=0"; \ tag: "br" "\n"; \ tag: "ps" "ps"; \ tag: "hilight" "+ font=Tizen:style=Bold"; \ @@ -56,7 +76,10 @@ styles{ TABBAR_TEXT_STYLE(30) - TOOLBAR_TEXT_STYLE(36) + TABBAR_SELECTED_TEXT_STYLE(30) + TABBAR_PRESSED_TEXT_STYLE(30) + TOOLBAR_TEXT_STYLE(38) + TOOLBAR_PRESSED_TEXT_STYLE(38) } group { name: "elm/toolbar/base/default"; @@ -148,11 +171,11 @@ group { name: "elm/toolbar/item/default"; visible: 0; image { normal: "00_toolbar_press.png"; - border: TOOLBAR_ITEM_BG_SELECTED_BORDER_INC; + border: TOOLBAR_ITEM_BG_PRESSED_BORDER_INC; border_scale: 1; } } - description { state: "selected" 0.0; + description { state: "pressed" 0.0; inherit: "default" 0.0; visible: 1; } @@ -175,15 +198,15 @@ group { name: "elm/toolbar/item/default"; } description { state: "1_item" 0.0; inherit: "default" 0.0; - min: 60 0; + min: TOOLBAR_ITEM_ONE_ITEM_PADDING_SIZE 0; } description { state: "2_items" 0.0; inherit: "default" 0.0; - min: 40 0; + min: TOOLBAR_ITEM_TWO_ITEMS_PADDING_SIZE 0; } description { state: "3_items" 0.0; inherit: "default" 0.0; - min: 20 0; + min: TOOLBAR_ITEM_THREE_ITEMS_PADDING_SIZE 0; } } part { name: "padding_right_bottom"; @@ -200,15 +223,15 @@ group { name: "elm/toolbar/item/default"; } description { state: "1_item" 0.0; inherit: "default" 0.0; - min: 60 0; + min: TOOLBAR_ITEM_ONE_ITEM_PADDING_SIZE 0; } description { state: "2_items" 0.0; inherit: "default" 0.0; - min: 40 0; + min: TOOLBAR_ITEM_TWO_ITEMS_PADDING_SIZE 0; } description { state: "3_items" 0.0; inherit: "default" 0.0; - min: 20 0; + min: TOOLBAR_ITEM_THREE_ITEMS_PADDING_SIZE 0; } } part { name: "elm.text"; @@ -229,7 +252,7 @@ group { name: "elm/toolbar/item/default"; fixed: 1 1; max: 9999 60; text { - style: "toolbar_text_style_36"; + style: "toolbar_text_style_38"; min: 0 1; } } @@ -237,6 +260,10 @@ group { name: "elm/toolbar/item/default"; inherit: "default" 0.0; visible: 1; } + description { state: "pressed" 0.0; + inherit: visible; + text.style: "toolbar_pressed_text_style_38"; + } } part { name: "elm.text_new"; type: TEXTBLOCK; @@ -256,7 +283,7 @@ group { name: "elm/toolbar/item/default"; color: BUTTON_NAVIFRAME_DEFAULT_TEXT_COLOR_INC; fixed: 1 1; text { - style: "toolbar_text_style_36"; + style: "toolbar_text_style_38"; min: 0 1; } } @@ -264,6 +291,10 @@ group { name: "elm/toolbar/item/default"; inherit: "default" 0.0; visible: 1; } + description { state: "pressed" 0.0; + inherit: visible; + text.style: "toolbar_pressed_text_style_38"; + } } part { name: "elm.text.clipper"; type: RECT; @@ -293,8 +324,8 @@ group { name: "elm/toolbar/item/default"; type: RECT; scale: 1; description { state: "default" 0.0; - min: 2 78; - max: 2 78; + min: TOOLBAR_ITEM_DIVIDER_SIZE; + max: TOOLBAR_ITEM_DIVIDER_SIZE; fixed: 1 1; rel1 { relative: 1.0 0.5; @@ -312,7 +343,7 @@ group { name: "elm/toolbar/item/default"; type: RECT; clip_to: "divider"; description { state: "default" 0.0; - color: TABBAR_ITEM_DIVIDER_LEFT_COLOR_INC; + color: TOOLBAR_ITEM_DIVIDER_LEFT_COLOR_INC; rel1 { relative: 0.0 0.0; to: "divider"; @@ -327,7 +358,7 @@ group { name: "elm/toolbar/item/default"; type: RECT; clip_to: "divider"; description { state: "default" 0.0; - color: TABBAR_ITEM_DIVIDER_RIGHT_COLOR_INC; + color: TOOLBAR_ITEM_DIVIDER_RIGHT_COLOR_INC; rel1 { relative: 0.5 0.0; to: "divider"; @@ -361,7 +392,7 @@ group { name: "elm/toolbar/item/default"; visible: 0; image { normal: "00_tab_focus.png"; - border: 8 8 8 8; + border: TOOLBAR_ITEM_TAB_FOCUS_BORDER_INC; border_scale: 1; } } @@ -377,16 +408,21 @@ group { name: "elm/toolbar/item/default"; source: "event"; script { if (get_int(item_state) != ITEM_STATE_DISABLED) - set_state(PART:"bg", "selected", 0.0); + { + set_state(PART:"bg", "pressed", 0.0); + set_state(PART:"elm.text", "pressed", 0.0); + set_state(PART:"elm.text_new", "pressed", 0.0); + } } - transition: LINEAR 0.2; } program { name: "unpressed"; signal: "mouse,up,1"; source: "event2"; - action: STATE_SET "default" 0.0; - target: "bg"; - transition: LINEAR 0.1; + script { + set_state(PART:"bg", "default", 0.0); + set_state(PART:"elm.text", "visible", 0.0); + set_state(PART:"elm.text_new", "visible", 0.0); + } } program { name: "go"; signal: "mouse,clicked,1"; @@ -452,7 +488,6 @@ group { name: "elm/toolbar/item/default"; action: STATE_SET "animation" 0.0; target: "elm.text.clipper"; target: "elm.text_new.clipper"; - transition: LINEAR 0.2; after: "label_set,animation,done"; } program { name: "label_set,animation,done"; @@ -549,8 +584,8 @@ group { name: "elm/toolbar/separator/default"; type: RECT; scale: 1; description { state: "default" 0.0; - min: 2 88; - max: 2 88; + min: TABBAR_ITEM_DIVIDER_SIZE; + max: TABBAR_ITEM_DIVIDER_SIZE; fixed: 1 1; rel1 { relative: 0.5 0.5; @@ -648,6 +683,8 @@ group { name: "elm/toolbar/base/tabbar"; } image { normal: "00_title_bg.png"; + border: TABBAR_ITEM_BG_DEFAULT_BORDER_INC; + border_scale: 1; } } } @@ -843,10 +880,19 @@ group { name: "elm/toolbar/item/tabbar"; public text_w; public org_text_w; public loop_count = 0; + public selected = 0; + public pressed = 0; public get_width() { new x, y, w, h; - set_state(PART:"elm.text", "visible", 0.0); + if (get_int(selected)) + { + set_state(PART:"elm.text", "selected", 0.0); + } + else + { + set_state(PART:"elm.text", "visible", 0.0); + } get_geometry(PART:"elm.text", x, y, w, h); set_int(org_text_w, w); @@ -868,7 +914,14 @@ group { name: "elm/toolbar/item/tabbar"; set_state_val(PART:"elm.text", STATE_REL2_OFFSET, TOOLBAR_SLIDING_TEXT_OFFSET, 0); set_state(PART:"elm.text", "custom", 0.0); } else { - set_state(PART:"elm.text", "visible", 0.0); + if (get_int(selected)) + { + set_state(PART:"elm.text", "selected", 0.0); + } + else + { + set_state(PART:"elm.text", "visible", 0.0); + } set_state(PART:"elm.text.dim.right", "default", 0.0); } } @@ -947,7 +1000,7 @@ group { name: "elm/toolbar/item/tabbar"; } image { normal: "00_tab_select_bar.png"; - border: 1 1 1 1; + border: TABBAR_ITEM_TAB_SELECT_BAR_BORDER_INC; border_scale: 1; } align: 0.0 1.0; @@ -968,7 +1021,7 @@ group { name: "elm/toolbar/item/tabbar"; visible: 0; image { normal: "00_tab_press.png"; - border: 0 0 8 0; + border: TABBAR_ITEM_TAB_PRESS_BORDER_INC; border_scale: 1; } } @@ -1079,32 +1132,6 @@ group { name: "elm/toolbar/item/tabbar"; color: 0 0 0 0; } } - part { name: "elm.swallow.icon.proxy"; - type: PROXY; - scale: 1; - clip_to: "elm.icon.proxy.clipper"; - description { state: "default" 0.0; - source: "elm.swallow.icon"; - proxy.source_clip: 0; - rel1.to: "elm.swallow.icon"; - rel1.offset: 0 3; - rel2.to: "elm.swallow.icon"; - rel2.offset: -1 2; - } - } - part { name: "elm.swallow.icon_new.proxy"; - type: PROXY; - scale: 1; - clip_to: "elm.icon_new.proxy.clipper"; - description { state: "default" 0.0; - source: "elm.swallow.icon_new"; - proxy.source_clip: 0; - rel1.to: "elm.swallow.icon_new"; - rel1.offset: 0 3; - rel2.to: "elm.swallow.icon_new"; - rel2.offset: -1 2; - } - } part { name: "elm.swallow.icon"; type: SWALLOW; scale: 1; @@ -1180,6 +1207,54 @@ group { name: "elm/toolbar/item/tabbar"; visible: 1; } } + part { name: "elm.swallow.icon.proxy"; + type: PROXY; + scale: 1; + clip_to: "elm.icon.proxy.clipper"; + description { state: "default" 0.0; + source: "elm.swallow.icon"; + proxy.source_clip: 0; + rel1.to: "elm.swallow.icon"; + rel1.offset: 0 2; + rel2.to: "elm.swallow.icon"; + rel2.offset: 0 2; + } + } + part { name: "elm.swallow.icon_new.proxy"; + type: PROXY; + scale: 1; + clip_to: "elm.icon_new.proxy.clipper"; + description { state: "default" 0.0; + source: "elm.swallow.icon_new"; + proxy.source_clip: 0; + rel1.to: "elm.swallow.icon_new"; + rel1.offset: 0 2; + rel2.to: "elm.swallow.icon_new"; + rel2.offset: 0 2; + } + } + part { name: "elm.swallow.icon.proxy.2"; + type: PROXY; + scale: 1; + clip_to: "elm.icon.proxy.clipper.2"; + description { state: "default" 0.0; + source: "elm.swallow.icon"; + proxy.source_clip: 0; + rel1.to: "elm.swallow.icon"; + rel2.to: "elm.swallow.icon"; + } + } + part { name: "elm.swallow.icon_new.proxy.2"; + type: PROXY; + scale: 1; + clip_to: "elm.icon_new.proxy.clipper.2"; + description { state: "default" 0.0; + source: "elm.swallow.icon_new"; + proxy.source_clip: 0; + rel1.to: "elm.swallow.icon_new"; + rel2.to: "elm.swallow.icon_new"; + } + } part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 0; @@ -1208,8 +1283,16 @@ group { name: "elm/toolbar/item/tabbar"; inherit: "default" 0.0; visible: 1; } - description { state: "sliding" 0.0; + description { state: "selected" 0.0; inherit: "visible" 0.0; + text.style: "tabbar_selected_text_style_30"; + } + description { state: "pressed" 0.0; + inherit: "visible" 0.0; + text.style: "tabbar_pressed_text_style_30"; + } + description { state: "sliding" 0.0; + inherit: "selected" 0.0; rel1.offset: TOOLBAR_SLIDING_TEXT_OFFSET 0; rel2.offset: TOOLBAR_SLIDING_TEXT_OFFSET 0; text.min: 1 1; @@ -1244,8 +1327,16 @@ group { name: "elm/toolbar/item/tabbar"; inherit: "default" 0.0; visible: 1; } - description { state: "sliding" 0.0; + description { state: "selected" 0.0; + inherit: "visible" 0.0; + text.style: "tabbar_selected_text_style_30"; + } + description { state: "pressed" 0.0; inherit: "visible" 0.0; + text.style: "tabbar_pressed_text_style_30"; + } + description { state: "sliding" 0.0; + inherit: "selected" 0.0; rel1.offset: TOOLBAR_SLIDING_TEXT_OFFSET 0; rel2.offset: TOOLBAR_SLIDING_TEXT_OFFSET 0; text.min: 1 1; @@ -1270,15 +1361,15 @@ group { name: "elm/toolbar/item/tabbar"; } description { state: "default" 0.10; inherit: "default" 0.0; - min: 10 10; + min: TABBAR_BADGE_ONE_ITEM_PADDING_SIZE; } description { state: "default" 0.06; inherit: "default" 0.0; - min: 6 10; + min: TABBAR_BADGE_TWO_ITEMS_PADDING_SIZE; } description { state: "default" 0.04; inherit: "default" 0.0; - min: 4 10; + min: TABBAR_BADGE_THREE_ITEMS_PADDING_SIZE; } } part { name: "elm.image.badge"; @@ -1298,7 +1389,7 @@ group { name: "elm/toolbar/item/tabbar"; } image { normal: "00_badge_bg.png"; - border: 26 26 0 0; + border: TABBAR_BADGE_BG_IMAGE_BORDER_INC; border_scale: 1; } } @@ -1363,7 +1454,7 @@ group { name: "elm/toolbar/item/tabbar"; min: 30 0; fixed: 1 0; align: 1.0 0.5; - color: 250 250 250 255; + color: TABBAR_BADGE_TEXT_COLOR_INC; text { font: "Tizen:style=Bold"; size: 34; @@ -1420,6 +1511,66 @@ group { name: "elm/toolbar/item/tabbar"; color: 255 255 255 153; } } + part { name: "elm.icon.clipper"; + type: RECT; + description { state: "default" 0.0; + rel1 { + relative: 1.0 1.0; + to: "padding_left_top"; + } + rel2 { + relative: 0.0 0.0; + to: "padding_right_bottom"; + } + color: TABBAR_ITEM_DEFAULT_ICON_COLOR_INC; + } + description { state: "animation" 0.0; + inherit: "default" 0.0; + color: TABBAR_ITEM_DEFAULT_ICON_COLOR_INC; + } + description { state: "selected" 0.0; + inherit: "default" 0.0; + color: TABBAR_ITEM_DEFAULT_ICON_COLOR_INC; + } + description { state: "pressed" 0.0; + inherit: "default" 0.0; + color: TABBAR_ITEM_DEFAULT_ICON_COLOR_INC; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: TABBAR_ITEM_DEFAULT_ICON_COLOR_INC; + } + } + part { name: "elm.icon_new.clipper"; + type: RECT; + description { state: "default" 0.0; + rel1 { + relative: 1.0 1.0; + to: "padding_left_top"; + } + rel2 { + relative: 0.0 0.0; + to: "padding_right_bottom"; + } + color: TABBAR_ITEM_DEFAULT_ICON_COLOR_INC; + } + description { state: "animation" 0.0; + inherit: "default" 0.0; + color: TABBAR_ITEM_DEFAULT_ICON_COLOR_INC; + } + description { state: "selected" 0.0; + inherit: "default" 0.0; + color: TABBAR_ITEM_DEFAULT_ICON_COLOR_INC; + } + description { state: "pressed" 0.0; + inherit: "default" 0.0; + color: TABBAR_ITEM_DEFAULT_ICON_COLOR_INC; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: TABBAR_ITEM_DEFAULT_ICON_COLOR_INC; + } + } part { name: "elm.icon.proxy.clipper"; type: RECT; description { state: "default" 0.0; @@ -1431,19 +1582,23 @@ group { name: "elm/toolbar/item/tabbar"; relative: 0.0 0.0; to: "padding_right_bottom"; } - color: 0 0 0 255; + color: TABBAR_ITEM_ICON_SHADOW_COLOR_INC; } description { state: "animation" 0.0; inherit: "default" 0.0; - color: 0 0 0 255; + color: TABBAR_ITEM_ICON_SHADOW_COLOR_INC; } description { state: "selected" 0.0; inherit: "default" 0.0; - color: 0 0 0 255; + color: TABBAR_ITEM_ICON_SHADOW_COLOR_INC; + } + description { state: "pressed" 0.0; + inherit: "default" 0.0; + color: TABBAR_ITEM_PRESSED_ICON_SHADOW_COLOR_INC; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 0 0 0 255; + color: TABBAR_ITEM_ICON_SHADOW_COLOR_INC; } } part { name: "elm.icon_new.proxy.clipper"; @@ -1457,23 +1612,26 @@ group { name: "elm/toolbar/item/tabbar"; relative: 0.0 0.0; to: "padding_right_bottom"; } - color: 0 0 0 255; + color: TABBAR_ITEM_ICON_SHADOW_COLOR_INC; } description { state: "animation" 0.0; inherit: "default" 0.0; - color: 0 0 0 255; + color: TABBAR_ITEM_ICON_SHADOW_COLOR_INC; } description { state: "selected" 0.0; inherit: "default" 0.0; - color: 0 0 0 255; + color: TABBAR_ITEM_ICON_SHADOW_COLOR_INC; + } + description { state: "pressed" 0.0; + inherit: "default" 0.0; + color: TABBAR_ITEM_PRESSED_ICON_SHADOW_COLOR_INC; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 0 0 0 255; + color: TABBAR_ITEM_ICON_SHADOW_COLOR_INC; } } - - part { name: "elm.icon.clipper"; + part { name: "elm.icon.proxy.clipper.2"; type: RECT; description { state: "default" 0.0; rel1 { @@ -1484,22 +1642,26 @@ group { name: "elm/toolbar/item/tabbar"; relative: 0.0 0.0; to: "padding_right_bottom"; } - color: 255 255 255 255; + color: TABBAR_ITEM_ICON_COLOR_INC; } description { state: "animation" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color: TABBAR_ITEM_ICON_COLOR_INC; } description { state: "selected" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color: TABBAR_ITEM_SELECTED_ICON_COLOR_INC; + } + description { state: "pressed" 0.0; + inherit: "default" 0.0; + color: TABBAR_ITEM_PRESSED_ICON_COLOR_INC; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color: TABBAR_ITEM_DISABLED_ICON_COLOR_INC; } } - part { name: "elm.icon_new.clipper"; + part { name: "elm.icon_new.proxy.clipper.2"; type: RECT; description { state: "default" 0.0; rel1 { @@ -1510,19 +1672,23 @@ group { name: "elm/toolbar/item/tabbar"; relative: 0.0 0.0; to: "padding_right_bottom"; } - color: 255 255 255 255; + color: TABBAR_ITEM_ICON_COLOR_INC; } description { state: "animation" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color: TABBAR_ITEM_ICON_COLOR_INC; } description { state: "selected" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color: TABBAR_ITEM_SELECTED_ICON_COLOR_INC; + } + description { state: "pressed" 0.0; + inherit: "default" 0.0; + color: TABBAR_ITEM_PRESSED_ICON_COLOR_INC; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color: TABBAR_ITEM_DISABLED_ICON_COLOR_INC; } } part { name: "elm.text.dim.left"; @@ -1581,8 +1747,8 @@ group { name: "elm/toolbar/item/tabbar"; type: RECT; scale: 1; description { state: "default" 0.0; - min: 2 88; - max: 2 88; + min: TABBAR_ITEM_DIVIDER_SIZE; + max: TABBAR_ITEM_DIVIDER_SIZE; fixed: 1 1; rel1 { relative: 1.0 0.5; @@ -1633,7 +1799,7 @@ group { name: "elm/toolbar/item/tabbar"; visible: 0; image { normal: "00_tab_focus.png"; - border: 8 8 8 8; + border: TABBAR_ITEM_TAB_FOCUS_BORDER_INC; border_scale: 1; } } @@ -1678,6 +1844,7 @@ group { name: "elm/toolbar/item/tabbar"; action: STATE_SET "selected" 0.0; target: "elm.icon.clipper"; target: "elm.icon.proxy.clipper"; + target: "elm.icon.proxy.clipper.2"; target: "selected_line"; after: "selected_text"; } @@ -1685,7 +1852,10 @@ group { name: "elm/toolbar/item/tabbar"; script{ new st[31]; new Float:vl; + set_int(selected, 1); get_state(PART:"elm.text", st, 30, vl); + if (!strcmp(st, "visible")) + set_state(PART:"elm.text", "selected", vl); if (strcmp(st, "default")) run_program(PROGRAM:"slide_start"); } @@ -1696,6 +1866,7 @@ group { name: "elm/toolbar/item/tabbar"; action: STATE_SET "default" 0.0; target: "elm.icon.clipper"; target: "elm.icon.proxy.clipper"; + target: "elm.icon.proxy.clipper.2"; target: "selected_line"; after: "unselected_text"; } @@ -1703,7 +1874,10 @@ group { name: "elm/toolbar/item/tabbar"; script{ new st[31]; new Float:vl; + set_int(selected, 0); get_state(PART:"elm.text", st, 30, vl); + if (!strcmp(st, "selected")) + set_state(PART:"elm.text", "visible", vl); if (strcmp(st, "default")) run_program(PROGRAM:"slide_stop"); } @@ -1711,14 +1885,21 @@ group { name: "elm/toolbar/item/tabbar"; program { name: "moving"; signal: "elm,state,moving"; source: "elm"; - action: STATE_SET "moving" 0.0; - target: "bg_cover"; + script { + set_state(PART:"bg_cover", "moving", 0.0); + } } program { name: "pressed"; signal: "mouse,down,1"; source: "event"; - action: STATE_SET "pressed" 0.0; - target: "bg_cover"; + script { + set_state(PART:"bg_cover", "pressed", 0.0); + set_state(PART:"elm.text", "pressed", 0.0); + set_state(PART:"elm.icon.clipper", "pressed", 0.0); + set_state(PART:"elm.icon.proxy.clipper", "pressed", 0.0); + set_state(PART:"elm.icon.proxy.clipper.2", "pressed", 0.0); + set_int(pressed, 1); + } } program { name: "drag"; @@ -1736,6 +1917,20 @@ group { name: "elm/toolbar/item/tabbar"; { set_drag(PART:"event", 0.0, 0.0); set_state(PART:"bg_cover", "default", 0.0); + if (get_int(selected)) + { + set_state(PART:"elm.text", "selected", 0.0); + set_state(PART:"elm.icon.clipper", "selected", 0.0); + set_state(PART:"elm.icon.proxy.clipper", "selected", 0.0); + set_state(PART:"elm.icon.proxy.clipper.2", "selected", 0.0); + } + else + { + set_state(PART:"elm.text", "visible", 0.0); + set_state(PART:"elm.icon.clipper", "default", 0.0); + set_state(PART:"elm.icon.proxy.clipper", "default", 0.0); + set_state(PART:"elm.icon.proxy.clipper.2", "default", 0.0); + } } set_drag(PART:"event", 0.0, 0.0); } @@ -1747,6 +1942,21 @@ group { name: "elm/toolbar/item/tabbar"; script { set_drag(PART:"event", 0.0, 0.0); set_state(PART:"bg_cover", "default", 0.0); + set_int(pressed, 0); + if (get_int(selected)) + { + set_state(PART:"elm.text", "selected", 0.0); + set_state(PART:"elm.icon.clipper", "selected", 0.0); + set_state(PART:"elm.icon.proxy.clipper", "selected", 0.0); + set_state(PART:"elm.icon.proxy.clipper.2", "selected", 0.0); + } + else + { + set_state(PART:"elm.text", "visible", 0.0); + set_state(PART:"elm.icon.clipper", "default", 0.0); + set_state(PART:"elm.icon.proxy.clipper", "default", 0.0); + set_state(PART:"elm.icon.proxy.clipper.2", "default", 0.0); + } } } program { name: "go"; @@ -1777,6 +1987,7 @@ group { name: "elm/toolbar/item/tabbar"; set_state(PART:"elm.text.clipper", "disabled", 0.0); set_state(PART:"elm.icon.clipper", "disabled", 0.0); set_state(PART:"elm.icon.proxy.clipper", "disabled", 0.0); + set_state(PART:"elm.icon.proxy.clipper.2", "disabled", 0.0); run_program(PROGRAM:"label_set,animation,done"); run_program(PROGRAM:"icon_set,animation,done"); } @@ -1790,6 +2001,7 @@ group { name: "elm/toolbar/item/tabbar"; set_state(PART:"elm.text.clipper", "default", 0.0); set_state(PART:"elm.icon.clipper", "default", 0.0); set_state(PART:"elm.icon.proxy.clipper", "default", 0.0); + set_state(PART:"elm.icon.proxy.clipper.2", "default", 0.0); run_program(PROGRAM:"label_set,animation,done"); run_program(PROGRAM:"icon_set,animation,done"); } @@ -1853,6 +2065,8 @@ group { name: "elm/toolbar/item/tabbar"; target: "elm.icon_new.clipper"; target: "elm.icon.proxy.clipper"; target: "elm.icon_new.proxy.clipper"; + target: "elm.icon.proxy.clipper.2"; + target: "elm.icon_new.proxy.clipper.2"; after: "icon_set,animation,done"; } program { name: "icon_set,animation,done"; @@ -1867,11 +2081,13 @@ group { name: "elm/toolbar/item/tabbar"; { set_state(PART:"elm.icon.clipper", "default", 0.0); set_state(PART:"elm.icon.proxy.clipper", "default", 0.0); + set_state(PART:"elm.icon.proxy.clipper.2", "default", 0.0); } else { set_state(PART:"elm.icon.clipper", "disabled", 0.0); set_state(PART:"elm.icon.proxy.clipper", "disabled", 0.0); + set_state(PART:"elm.icon.proxy.clipper.2", "disabled", 0.0); } } } @@ -1889,7 +2105,10 @@ group { name: "elm/toolbar/item/tabbar"; set_state(PART:"padding_after_icon", "visible", 0.0); set_state(PART:"bg", "icon_text", 0.0); } - set_state(PART:"elm.text", "visible", 0.0); + if (get_int(selected)) + set_state(PART:"elm.text", "selected", 0.0); + else + set_state(PART:"elm.text", "visible", 0.0); } } program { name: "text_hide"; @@ -2098,7 +2317,7 @@ group { name: "elm/toolbar/base/tabbar/item_with_title"; } image { normal: "00_sub_title_bg.png"; - border: 8 8 35 35; + border: TABBAR_ITEM_BG_DEFAULT_BORDER_INC; border_scale: 1; } } @@ -2135,8 +2354,8 @@ group { name: "elm/toolbar/item/tabbar/item_with_title"; type: RECT; scale: 1; description { state: "default" 0.0; - min: 2 48; - max: 2 48; + min: TABBAR_ITEM_WITH_TITLE_DIVIDER_SIZE; + max: TABBAR_ITEM_WITH_TITLE_DIVIDER_SIZE; fixed: 1 1; rel1 { relative: 1.0 0.5;