From: Amit Kamboj Date: Wed, 22 May 2013 04:42:50 +0000 (+0530) Subject: [button] Added naviframe/toolbar button min/max size. X-Git-Tag: accepted/tizen/20131029.210118~278 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0887d3caf405a7ed3b8edb3b7c05c2f8e1448fb8;p=profile%2Fivi%2Fefl-theme-tizen.git [button] Added naviframe/toolbar button min/max size. Change-Id: I67fe1b63d4aa57e6a73d47b000e47a2c01f430f4 --- diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc index 235c86e..b53c58a 100644 --- a/themes/inc/tizen-hd-inc.edc +++ b/themes/inc/tizen-hd-inc.edc @@ -561,7 +561,7 @@ #define BUTTON_NAVIFRAME_LANDSCAPE_TITLE_ICON_TOP_PADDING_INC 0 17 #define BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_MIN_INC 182 72 -#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_MAX_INC 9999 72 +#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_MAX_INC 496 72 #define BUTTON_NAVIFRAME_TITLE_TEXTBLOCK_MIN_INC 126 70 #define BUTTON_NAVIFRAME_TITLE_TEXT_BG_PRESSED_BORDER_INC 35 35 35 35 #define BUTTON_NAVIFRAME_TITLE_TEXT_PADDING_MIN_INC 28 5 @@ -569,6 +569,10 @@ #define BUTTON_NAVIFRAME_TITLE_VISIBLE_PADDING_ICON_TEXT_MIN_INC 8 0 #define BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_COLOR_INC 249 249 249 255 +#define BUTTON_NAVIFRAME_TITLE_TEXT_LANDSCAPE_BG_NORMAL_MIN_INC 330 72 +#define BUTTON_NAVIFRAME_TITLE_TEXT_LANDSCAPE_BG_NORMAL_MAX_INC 1012 72 +#define BUTTON_NAVIFRAME_TITLE_LANDSCAPE_TEXTBLOCK_MIN_INC 274 70 + #define BUTTON_TOOLBAR_SEGMENTEDCONTROL_TEXT_FONT_SIZE_INC 32 #define BUTTON_TOOLBAR_SEGMENTEDCONTROL_BG_NORMAL_MIN_INC 190 70 #define BUTTON_TOOLBAR_SEGMENTEDCONTROL_BG_NORMAL_MAX_INC 9999 70 diff --git a/themes/widgets/button.edc b/themes/widgets/button.edc index 022f2ac..212b8d9 100644 --- a/themes/widgets/button.edc +++ b/themes/widgets/button.edc @@ -19,6 +19,8 @@ #define BUTTON_STATE_ENABLED 0 #define BUTTON_STATE_DISABLED 1 +#define BUTTON_LANDSCAPE_DISABLED 0 +#define BUTTON_LANDSCAPE_ENABLED 1 sounds { sample { @@ -4418,9 +4420,11 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") } script { public button_state = BUTTON_STATE_ENABLED; + public landscape_state = BUTTON_LANDSCAPE_DISABLED; } parts { - part { name: "button_image"; + part { name: "button_bg"; + type: SPACER; scale: 1; description { state: "default" 0.0; min: BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_MIN_INC; @@ -4428,6 +4432,18 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") fixed: 1 1; rel1.to: "padding_text_left_top"; rel2.to: "padding_text_right_bottom"; + } + description { state: "landscape" 0.0; + inherit: "default" 0.0; + min: BUTTON_NAVIFRAME_TITLE_TEXT_LANDSCAPE_BG_NORMAL_MIN_INC; + max: BUTTON_NAVIFRAME_TITLE_TEXT_LANDSCAPE_BG_NORMAL_MAX_INC; + } + } + part { name: "button_image"; + scale: 1; + description { state: "default" 0.0; + rel1.to: "button_bg"; + rel2.to: "button_bg"; image { normal: "00_toolbar_button.png"; border: BUTTON_NAVIFRAME_TITLE_TEXT_BG_PRESSED_BORDER_INC; @@ -4526,10 +4542,18 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") style: "btn_naviframe_toolbar"; } } + description { state: "landscape" 0.0; + inherit: "default" 0.0; + min: BUTTON_NAVIFRAME_TITLE_LANDSCAPE_TEXTBLOCK_MIN_INC; + } description { state: "visible" 0.0; inherit: "default" 0.0; visible: 1; } + description { state: "landscape_visible" 0.0; + inherit: "landscape" 0.0; + visible: 1; + } description { state: "clicked" 0.0; inherit: "default" 0.0; visible: 1; @@ -4537,9 +4561,19 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") style: "btn_naviframe_toolbar_pressed"; } } + description { state: "landscape_clicked" 0.0; + inherit: "landscape" 0.0; + visible: 1; + text { + style: "btn_naviframe_toolbar_pressed"; + } + } description { state: "disabled" 0.0; inherit: "default" 0.0; } + description { state: "landscape_disabled" 0.0; + inherit: "landscape" 0.0; + } description { state: "disabled_visible" 0.0; inherit: "default" 0.0; visible: 1; @@ -4547,6 +4581,13 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") style: "btn_naviframe_toolbar_disabled"; } } + description { state: "landscape_disabled_visible" 0.0; + inherit: "landscape" 0.0; + visible: 1; + text { + style: "btn_naviframe_toolbar_disabled"; + } + } description { state: "focused" 0.0; inherit: "default" 0.0; visible: 1; @@ -4554,6 +4595,13 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") style: "btn_naviframe_toolbar_pressed"; } } + description { state: "landscape_focused" 0.0; + inherit: "landscape" 0.0; + visible: 1; + text { + style: "btn_naviframe_toolbar_pressed"; + } + } } part { name: "disclip"; type: RECT; @@ -4606,9 +4654,13 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") after: "button_click_anim"; } program { name: "button_click_anim"; - action: STATE_SET "clicked" 0.0; - target: "button_image"; - target: "elm.text"; + script { + if (get_int(landscape_state) != BUTTON_LANDSCAPE_DISABLED) + set_state(PART:"elm.text", "landscape_clicked", 0.0); + else + set_state(PART:"elm.text", "clicked", 0.0); + set_state(PART:"button_image", "clicked", 0.0); + } } program { name: "button_double_click"; signal: "mouse,down,1,double"; @@ -4624,11 +4676,23 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") script { new st[31]; new Float:vl; - get_state(PART:"elm.text", st, 30, vl); - if (!strcmp(st, "clicked") || !strcmp(st, "focused")) + if (get_int(landscape_state) != BUTTON_LANDSCAPE_DISABLED) { - emit("elm,action,default,text,set", ""); - set_state(PART:"elm.text", "visible", 0.0); + get_state(PART:"elm.text", st, 30, vl); + if (!strcmp(st, "landscape_clicked") || !strcmp(st, "landscape_focused")) + { + emit("elm,action,default,text,set", ""); + set_state(PART:"elm.text", "landscape_visible", 0.0); + } + } + else + { + get_state(PART:"elm.text", st, 30, vl); + if (!strcmp(st, "clicked") || !strcmp(st, "focused")) + { + emit("elm,action,default,text,set", ""); + set_state(PART:"elm.text", "visible", 0.0); + } } if (get_int(button_state) != BUTTON_STATE_DISABLED) set_state(PART:"button_image", "default", 0.0); @@ -4649,16 +4713,30 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") source: "elm"; script { if (get_int(button_state) != BUTTON_STATE_DISABLED) - set_state(PART:"elm.text", "visible", 0.0); + { + if (get_int(landscape_state) != BUTTON_LANDSCAPE_DISABLED) + set_state(PART:"elm.text", "landscape_visible", 0.0); + else + set_state(PART:"elm.text", "visible", 0.0); + } else - set_state(PART:"elm.text", "disabled_visible", 0.0); + { + if (get_int(landscape_state) != BUTTON_LANDSCAPE_DISABLED) + set_state(PART:"elm.text", "landscape_disabled_visible", 0.0); + else + set_state(PART:"elm.text", "disabled_visible", 0.0); + } } } program { name: "text_hide"; signal: "elm,state,text,hidden"; source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.text"; + script { + if (get_int(landscape_state) != BUTTON_LANDSCAPE_DISABLED) + set_state(PART:"elm.text", "landscape", 0.0); + else + set_state(PART:"elm.text", "default", 0.0); + } } program { name: "disable"; signal: "elm,state,disabled"; @@ -4673,11 +4751,22 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") script { new st[31]; new Float:vl; - get_state(PART:"elm.text", st, 30, vl); - if (!strcmp(st, "visible")) - set_state(PART:"elm.text", "disabled_visible", 0.0); + if (get_int(landscape_state) != BUTTON_LANDSCAPE_DISABLED) + { + get_state(PART:"elm.text", st, 30, vl); + if (!strcmp(st, "landscape_visible")) + set_state(PART:"elm.text", "landscape_disabled_visible", 0.0); + else + set_state(PART:"elm.text", "landscape_disabled", 0.0); + } else - set_state(PART:"elm.text", "disabled", 0.0); + { + get_state(PART:"elm.text", st, 30, vl); + if (!strcmp(st, "visible")) + set_state(PART:"elm.text", "disabled_visible", 0.0); + else + set_state(PART:"elm.text", "disabled", 0.0); + } set_int(button_state, BUTTON_STATE_DISABLED); } } @@ -4694,14 +4783,87 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") script { new st[31]; new Float:vl; + if (get_int(landscape_state) != BUTTON_LANDSCAPE_DISABLED) + { + get_state(PART:"elm.text", st, 30, vl); + if (!strcmp(st, "landscape_disabled_visible")) + set_state(PART:"elm.text", "landscape_visible", 0.0); + else + set_state(PART:"elm.text", "landscape", 0.0); + } + else + { + get_state(PART:"elm.text", st, 30, vl); + if (!strcmp(st, "disabled_visible")) + set_state(PART:"elm.text", "visible", 0.0); + else + set_state(PART:"elm.text", "default", 0.0); + } + set_int(button_state, BUTTON_STATE_ENABLED); + } + } + program { name: "change_to_landscape"; + signal: "elm,state,landscape"; + source: "elm"; + script { + new st[31]; + new Float:vl; + set_int(landscape_state, BUTTON_LANDSCAPE_ENABLED); get_state(PART:"elm.text", st, 30, vl); - if (!strcmp(st, "disabled_visible")) - set_state(PART:"elm.text", "visible", 0.0); + if (!strcmp(st, "default")) + set_state(PART:"elm.text", "landscape", 0.0); + else if (!strcmp(st, "clicked")) + set_state(PART:"elm.text", "landscape_clicked", 0.0); + else if (!strcmp(st, "disabled")) + set_state(PART:"elm.text", "landscape_disabled", 0.0); + else if (!strcmp(st, "disabled_visible")) + set_state(PART:"elm.text", "landscape_disabled_visible", 0.0); else + set_state(PART:"elm.text", "landscape_visible", 0.0); + set_state(PART:"button_bg", "landscape", 0.0); + } + } + program { name: "change_to_portrait"; + signal: "elm,state,portrait"; + source: "elm"; + script { + new st[31]; + new Float:vl; + set_int(landscape_state, BUTTON_LANDSCAPE_DISABLED); + get_state(PART:"elm.text", st, 30, vl); + if (!strcmp(st, "landscape")) set_state(PART:"elm.text", "default", 0.0); - set_int(button_state, BUTTON_STATE_ENABLED); + else if (!strcmp(st, "landscape_clicked")) + set_state(PART:"elm.text", "clicked", 0.0); + else if (!strcmp(st, "landscape_disabled")) + set_state(PART:"elm.text", "disabled", 0.0); + else if (!strcmp(st, "landscape_disabled_visible")) + set_state(PART:"elm.text", "disabled_visible", 0.0); + else + set_state(PART:"elm.text", "visible", 0.0); + set_state(PART:"button_bg", "default", 0.0); } } + program { name: "landscape_mode"; + source: "elm"; + signal: "elm,state,orient,90"; + action: SIGNAL_EMIT "elm,state,landscape" "elm"; + } + program { name: "landscape_mode2"; + source: "elm"; + signal: "elm,state,orient,270"; + action: SIGNAL_EMIT "elm,state,landscape" "elm"; + } + program { name: "portrait_mode"; + source: "elm"; + signal: "elm,state,orient,0"; + action: SIGNAL_EMIT "elm,state,portrait" "elm"; + } + program { name: "portrait_mode2"; + source: "elm"; + signal: "elm,state,orient,180"; + action: SIGNAL_EMIT "elm,state,portrait" "elm"; + } program { name: "focused"; //signal: "elm,action,focus"; //source: "elm"; @@ -4724,7 +4886,8 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") group { name: "elm/button/base/naviframe/toolbar/left"; inherit: "elm/button/base/naviframe/toolbar/default"; parts { - part { name: "button_image"; + part { name: "button_bg"; + type: SPACER; scale: 1; description { state: "default" 0.0; min: BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_MIN_INC; @@ -4733,23 +4896,11 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") rel1.to: "padding_text_left_top"; rel2.to: "padding_text_right_bottom"; align: 1.0 0.5; - image { - normal: "00_toolbar_button.png"; - border: BUTTON_NAVIFRAME_TITLE_TEXT_BG_PRESSED_BORDER_INC; - border_scale: 1; - } - } - description { state: "clicked" 0.0; - inherit: "default" 0.0; - image.normal: "00_toolbar_button_press.png"; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - image.normal: "00_toolbar_button_dim.png"; } - description { state: "focused" 0.0; + description { state: "landscape" 0.0; inherit: "default" 0.0; - image.normal: "00_toolbar_button_press.png"; + min: BUTTON_NAVIFRAME_TITLE_TEXT_LANDSCAPE_BG_NORMAL_MIN_INC; + max: BUTTON_NAVIFRAME_TITLE_TEXT_LANDSCAPE_BG_NORMAL_MAX_INC; } } part { name: "elm.text"; @@ -4776,10 +4927,18 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") style: "btn_naviframe_toolbar"; } } + description { state: "landscape" 0.0; + inherit: "default" 0.0; + min: BUTTON_NAVIFRAME_TITLE_LANDSCAPE_TEXTBLOCK_MIN_INC; + } description { state: "visible" 0.0; inherit: "default" 0.0; visible: 1; } + description { state: "landscape_visible" 0.0; + inherit: "landscape" 0.0; + visible: 1; + } description { state: "clicked" 0.0; inherit: "default" 0.0; visible: 1; @@ -4787,9 +4946,19 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") style: "btn_naviframe_toolbar_pressed"; } } + description { state: "landscape_clicked" 0.0; + inherit: "landscape" 0.0; + visible: 1; + text { + style: "btn_naviframe_toolbar_pressed"; + } + } description { state: "disabled" 0.0; inherit: "default" 0.0; } + description { state: "landscape_disabled" 0.0; + inherit: "landscape" 0.0; + } description { state: "disabled_visible" 0.0; inherit: "default" 0.0; visible: 1; @@ -4797,6 +4966,13 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") style: "btn_naviframe_toolbar_disabled"; } } + description { state: "landscape_disabled_visible" 0.0; + inherit: "landscape" 0.0; + visible: 1; + text { + style: "btn_naviframe_toolbar_disabled"; + } + } description { state: "focused" 0.0; inherit: "default" 0.0; visible: 1; @@ -4804,6 +4980,13 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") style: "btn_naviframe_toolbar_pressed"; } } + description { state: "landscape_focused" 0.0; + inherit: "landscape" 0.0; + visible: 1; + text { + style: "btn_naviframe_toolbar_pressed"; + } + } } } } @@ -4812,7 +4995,8 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") group { name: "elm/button/base/naviframe/toolbar/right"; inherit: "elm/button/base/naviframe/toolbar/default"; parts { - part { name: "button_image"; + part { name: "button_bg"; + type: SPACER; scale: 1; description { state: "default" 0.0; min: BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_MIN_INC; @@ -4821,23 +5005,11 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") rel1.to: "padding_text_left_top"; rel2.to: "padding_text_right_bottom"; align: 0.0 0.5; - image { - normal: "00_toolbar_button.png"; - border: BUTTON_NAVIFRAME_TITLE_TEXT_BG_PRESSED_BORDER_INC; - border_scale: 1; - } - } - description { state: "clicked" 0.0; - inherit: "default" 0.0; - image.normal: "00_toolbar_button_press.png"; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - image.normal: "00_toolbar_button_dim.png"; } - description { state: "focused" 0.0; + description { state: "landscape" 0.0; inherit: "default" 0.0; - image.normal: "00_toolbar_button_press.png"; + min: BUTTON_NAVIFRAME_TITLE_TEXT_LANDSCAPE_BG_NORMAL_MIN_INC; + max: BUTTON_NAVIFRAME_TITLE_TEXT_LANDSCAPE_BG_NORMAL_MAX_INC; } } part { name: "elm.text"; @@ -4864,10 +5036,18 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") style: "btn_naviframe_toolbar"; } } + description { state: "landscape" 0.0; + inherit: "default" 0.0; + min: BUTTON_NAVIFRAME_TITLE_LANDSCAPE_TEXTBLOCK_MIN_INC; + } description { state: "visible" 0.0; inherit: "default" 0.0; visible: 1; } + description { state: "landscape_visible" 0.0; + inherit: "landscape" 0.0; + visible: 1; + } description { state: "clicked" 0.0; inherit: "default" 0.0; visible: 1; @@ -4875,9 +5055,19 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") style: "btn_naviframe_toolbar_pressed"; } } + description { state: "landscape_clicked" 0.0; + inherit: "landscape" 0.0; + visible: 1; + text { + style: "btn_naviframe_toolbar_pressed"; + } + } description { state: "disabled" 0.0; inherit: "default" 0.0; } + description { state: "landscape_disabled" 0.0; + inherit: "landscape" 0.0; + } description { state: "disabled_visible" 0.0; inherit: "default" 0.0; visible: 1; @@ -4885,6 +5075,13 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") style: "btn_naviframe_toolbar_disabled"; } } + description { state: "landscape_disabled_visible" 0.0; + inherit: "landscape" 0.0; + visible: 1; + text { + style: "btn_naviframe_toolbar_disabled"; + } + } description { state: "focused" 0.0; inherit: "default" 0.0; visible: 1; @@ -4892,6 +5089,13 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") style: "btn_naviframe_toolbar_pressed"; } } + description { state: "landscape_focused" 0.0; + inherit: "landscape" 0.0; + visible: 1; + text { + style: "btn_naviframe_toolbar_pressed"; + } + } } } } @@ -7194,3 +7398,5 @@ group { name: "elm/button/base/bubble_circle/sent"; #undef BUTTON_STATE_ENABLED #undef BUTTON_STATE_DISABLED +#undef BUTTON_LANDSCAPE_DISABLED +#undef BUTTON_LANDSCAPE_ENABLED