From 8331e2772fffcfb70e2dcf1ee73c584d03632b1c Mon Sep 17 00:00:00 2001 From: Jaehwan Kim Date: Tue, 3 May 2011 16:48:04 +0900 Subject: [PATCH] [button] navigationbar_control style min bug fix and new controlbar style --- themes/groups/button.edc | 443 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 437 insertions(+), 6 deletions(-) diff --git a/themes/groups/button.edc b/themes/groups/button.edc index 4684ef7..7aad505 100644 --- a/themes/groups/button.edc +++ b/themes/groups/button.edc @@ -9390,7 +9390,6 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt description { state: "visible" 0.0; inherit: "default" 0.0; visible: 1; - min: 90 24; } description { state: "clicked" 0.0; inherit: "default" 0.0; @@ -9409,7 +9408,6 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt color: 185 185 185 255; color3: 0 0 0 0; visible: 1; - min: 90 24; } description { state: "focused" 0.0; inherit: "default" 0.0; @@ -9837,7 +9835,6 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt description { state: "visible" 0.0; inherit: "default" 0.0; visible: 1; - min: 90 24; } description { state: "clicked" 0.0; inherit: "default" 0.0; @@ -9856,7 +9853,6 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt color: 185 185 185 255; color3: 0 0 0 0; visible: 1; - min: 90 24; } description { state: "focused" 0.0; inherit: "default" 0.0; @@ -10284,7 +10280,6 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt description { state: "visible" 0.0; inherit: "default" 0.0; visible: 1; - min: 90 24; } description { state: "clicked" 0.0; inherit: "default" 0.0; @@ -10303,7 +10298,443 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt color: 185 185 185 255; color3: 0 0 0 0; visible: 1; - min: 90 24; + } + description { state: "focused" 0.0; + inherit: "default" 0.0; + visible: 1; + min: 0 0; + color: 255 255 255 255; + color2: 0 0 0 102; + } + } + part { name: "over2"; + type: RECT; + mouse_events: 1; + repeat_events: 1; + ignore_flags: ON_HOLD; + description { state: "default" 0.0; + color: 0 0 0 0; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } + part { name: "over3"; + type: RECT; + mouse_events: 1; + repeat_events: 1; + description { state: "default" 0.0; + color: 0 0 0 0; + } + description { state: "clicked" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + part { name: "disabler"; + type: RECT; + description { state: "default" 0.0; + color: 0 0 0 0; + visible: 0; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + } + programs { + program { name: "button_click"; + signal: "mouse,down,1"; + source: "over2"; + action: SIGNAL_EMIT "elm,action,press" ""; + after: "button_click_anim"; + } + program { name: "button_click_anim"; + action: STATE_SET "clicked" 0.0; + target: "button_image"; + after: "text_clicked"; + } + program { name: "text_clicked"; + script { + new st[31]; + new Float:vl; + get_state(PART:"elm.text", st, 30, vl); + if (!strcmp(st, "visible")) + set_state(PART:"elm.text", "clicked", 0.0); + } + } + program { name: "button_unpress"; + action: SIGNAL_EMIT "elm,action,unpress" ""; + } + program { name: "button_mouseout_clicked"; + signal: "mouse,up,1"; + source: "over3"; + script { + new st[31]; + new Float:vl; + get_state(PART:"elm.swallow.content", st, 30, vl); + if (strcmp(st, "icononly")) + { + 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); + } + after: button_unpress; + } + program { name: "button_click2"; + signal: "mouse,down,1"; + source: "over3"; + action: STATE_SET "clicked" 0.0; + target: "over3"; + } + program { name: "button_unclick2"; + signal: "mouse,clicked,1"; + source: "over3"; + action: STATE_SET "default" 0.0; + target: "over3"; + } + program { name: "button_unclick3"; + signal: "mouse,clicked,1"; + source: "over2"; + action: SIGNAL_EMIT "elm,action,click" ""; + } + program { name: "text_show"; + signal: "elm,state,text,visible"; + source: "elm"; + script { + new st[31]; + new Float:vl; + get_state(PART:"elm.swallow.content", st, 30, vl); + if (!strcmp(st, "icononly")) + { + set_state(PART:"elm.swallow.content", "visible", 0.0); + set_state(PART:"icon_rect", "visible", 0.0); + set_state(PART:"padding_after_icon", "visible", 0.0); + } + if(get_int(button_state) != BUTTON_STATE_DISABLED) + set_state(PART:"elm.text", "visible", 0.0); + else + set_state(PART:"elm.text", "disabled_visible", 0.0); + } + } + program { name: "text_hide"; + signal: "elm,state,text,hidden"; + source: "elm"; + script { + new st[31]; + new Float:vl; + get_state(PART:"elm.swallow.content", st, 30, vl); + if (!strcmp(st, "visible")) + { + set_state(PART:"elm.swallow.content", "icononly", 0.0); + set_state(PART:"icon_rect", "icononly", 0.0); + set_state(PART:"padding_after_icon", "icononly", 0.0); + } + set_state(PART:"elm.text", "default", 0.0); + } + } + program { name: "icon_show"; + signal: "elm,state,icon,visible"; + source: "elm"; + script { + new st[31]; + new Float:vl; + get_state(PART:"elm.text", st, 30, vl); + if (!strcmp(st, "visible")) + { + set_state(PART:"elm.swallow.content", "visible", 0.0); + set_state(PART:"icon_rect", "visible", 0.0); + set_state(PART:"padding_after_icon", "visible", 0.0); + } + else + { + set_state(PART:"elm.swallow.content", "icononly", 0.0); + set_state(PART:"icon_rect", "icononly", 0.0); + set_state(PART:"padding_after_icon", "icononly", 0.0); + } + } + } + program { name: "icon_hide"; + signal: "elm,state,icon,hidden"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.swallow.content"; + } + program { name: "disable"; + signal: "elm,state,disabled"; + source: "elm"; + action: STATE_SET "disabled" 0.0; + target: "button_image"; + target: "over2"; + target: "disabler"; + after: "disable_text"; + } + program { name: "disable_text"; + 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); + else + set_state(PART:"elm.text", "disabled", 0.0); + set_int(button_state, BUTTON_STATE_DISABLED); + } + } + program { name: "enable"; + signal: "elm,state,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "button_image"; + target: "over2"; + target: "disabler"; + after: "enable_text"; + } + program { name: "enable_text"; + script { + new st[31]; + new Float:vl; + 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: "focused"; + action: STATE_SET "focused" 0.0; + target: "button_image"; + target: "elm.text"; + } + program { name: "unfocused"; + action: STATE_SET "default" 0.0; + target: "button_image"; + after: "unfocus_text"; + } + program { name: "unfocus_text"; + action: STATE_SET "visible" 0.0; + target: "elm.text"; + } + } + } + +/////////////////////////////////////////////////////////////////////////////////////// + group { name: "elm/button/base/controlbar/vertical"; + script { + public button_state = BUTTON_STATE_ENABLED; + } + parts { + part { name: "button_image"; + type: RECT; + mouse_events: 1; + scale: 1; + description { state: "default" 0.0; + min: 20 50; + rel1.offset: 5 5; + rel2.offset: -6 -6; + color: 0 0 0 0; + visible: 0; + } + } + part { + name: "padding_left"; + type: RECT; + scale: 1; + mouse_events: 0; + description { state: "default" 0.0; + align: 0.0 0.0; + rel1.relative: 0.0 0.0; + rel2.relative: 0.0 1.0; + min: 10 5; + fixed: 1 0; + color: 0 0 0 0; + } + } + part { + name: "padding_right"; + type: RECT; + scale: 1; + mouse_events: 0; + description { state: "default" 0.0; + align: 1.0 0.0; + rel1.relative: 1.0 0.0; + rel2.relative: 1.0 1.0; + min: 10 5; + fixed: 1 0; + color: 0 0 0 0; + } + } + part { + name: "padding_top"; + type: RECT; + scale: 1; + mouse_events: 0; + description { state: "default" 0.0; + align: 0.0 0.0; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 0.0; + min: 5 8; + fixed: 0 1; + color: 0 0 0 0; + } + } + part { + name: "padding_bottom"; + type: RECT; + scale: 1; + mouse_events: 0; + description { state: "default" 0.0; + align: 1.0 1.0; + rel1.relative: 0.0 1.0; + rel2.relative: 1.0 1.0; + min: 5 8; + fixed: 0 1; + color: 0 0 0 0; + } + } + part { + name: "icon_rect"; + type: RECT; + scale: 1; + mouse_events: 0; + description { state: "default" 0.0; + visible: 1; + min: 0 0; + fixed: 0 1; + rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; } + rel2 { relative: 0.0 1.0; to_x: "padding_right"; to_y: "padding_top"; } + align: 0.5 0.0; + color: 0 0 0 0; + } + description { state: "visible" 0.0; + visible: 1; + min: 44 44; + fixed: 0 1; + rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; } + rel2 { relative: 0.0 1.0; to_x: "padding_right"; to_y: "padding_top"; } + align: 0.5 0.0; + color: 0 0 0 0; + } + description { state: "icononly" 0.0; + inherit: "default" 0.0; + } + } + part { + name: "padding_after_icon"; + type: RECT; + scale: 1; + mouse_events: 0; + description { state: "default" 0.0; //when only icon or no icon is there + align: 0.0 0.0; + rel1 { relative: 0.0 1.0; to: "icon_rect"; } + rel2 { relative: 1.0 1.0; to: "icon_rect"; } + fixed: 0 1; + min: 0 0; + color: 0 0 0 0; + } + description { state: "visible" 0.0; + visible: 1; + align: 0.0 0.0; + rel1 { relative: 0.0 1.0; to: "icon_rect"; } + rel2 { relative: 1.0 1.0; to: "icon_rect"; } + fixed: 0 1; + min: 0 0; + color: 0 0 0 0; + } + description { state: "icononly" 0.0; + inherit: "default" 0.0; + } + } + part { + name: "padding_before_text"; + type: RECT; + scale: 1; + mouse_events: 0; + description { state: "default" 0.0; //when only icon or no icon is there + align: 0.5 1.0; + rel1 { relative: 1.0 0.0; to_x: "padding_left"; to_y: "elm.text"; } + rel2 { relative: 0.0 0.0; to_x: "padding_right"; to_y: "elm.text"; } + fixed: 0 1; + min: 0 0; + color: 0 0 0 0; + } + } + part { name: "elm.swallow.content"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + visible: 0; + align: 0.5 0.0; + rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; } + rel2 { relative: 0.0 1.0; to_x: "padding_right"; to_y: "padding_top"; } + fixed: 0 1; + } + description { state: "visible" 0.0; + fixed: 0 1; + visible: 1; + min: 44 44; + max: 44 44; + align: 0.5 0.5; + rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; } + rel2 { relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_before_text"; } + aspect: 1.0 1.0; + aspect_preference: HORIZONTAL; + } + description { state: "icononly" 0.0; + visible: 1; + min: 44 44; + max: 44 44; + rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; } + rel2 { relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; } + align: 0.5 0.5; + aspect: 1.0 1.0; + aspect_preference: HORIZONTAL; + } + } + part { name: "elm.text"; + type: TEXT; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + visible: 0; + rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_after_icon"; } + rel2 { relative: 0.0 1.0; to_x: "padding_right"; } + align: 0.5 0.5; + color: 255 255 255 255; + text { + font: "SLP:style=Medium"; + size: 18; + min: 0 0; + align: 0.5 0.5; + max: 1 0; + } + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + } + description { state: "clicked" 0.0; + inherit: "default" 0.0; + visible: 1; + min: 0 0; + color: 255 255 255 255; + color2: 0 0 0 102; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: 185 185 185 255; + color3: 0 0 0 0; + } + description { state: "disabled_visible" 0.0; + inherit: "default" 0.0; + color: 185 185 185 255; + color3: 0 0 0 0; + visible: 1; } description { state: "focused" 0.0; inherit: "default" 0.0; -- 2.7.4