From: ChunEon Park Date: Thu, 22 Sep 2011 12:20:30 +0000 (+0900) Subject: naviframe - added instant2 style X-Git-Tag: submit/2.0alpha-wayland/20121130.000903~544 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f93318e7fa231db6086b956afc1bba7e5441d835;p=profile%2Fivi%2Fefl-theme-tizen.git naviframe - added instant2 style fixed optionheader open/close status correctly. --- diff --git a/themes/groups/naviframe.edc b/themes/groups/naviframe.edc index fca3c9a..4140091 100644 --- a/themes/groups/naviframe.edc +++ b/themes/groups/naviframe.edc @@ -34,6 +34,7 @@ } } group { name:"elm/naviframe/item/basic/default"; + alias:"elm/naviframe/item/1line/default"; images { image: "naviframe_optionheader.png" COMP; image: "naviframe_optionheader_arrow.png" COMP; @@ -398,6 +399,7 @@ target: "optionheader_shadow"; target: "elm.swallow.optionheader"; transition: LINEAR 0.2; + after: "optionheader_open_set"; } program { name: "optionheader_close"; signal: "elm,state,optionheader,close"; @@ -407,6 +409,7 @@ target: "optionheader_shadow"; target: "elm.swallow.optionheader"; transition: LINEAR 0.2; + after: "optionheader_close_set"; } program { name: "optionheader_instant_open"; signal: "elm,state,optionheader,instant_open"; @@ -415,6 +418,7 @@ target: "optionheader_clip"; target: "optionheader_shadow"; target: "elm.swallow.optionheader"; + after: "optionheader_open_set"; } program { name: "optionheader_instant_close"; signal: "elm,state,optionheader,instant_close"; @@ -423,6 +427,21 @@ target: "optionheader_clip"; target: "optionheader_shadow"; target: "elm.swallow.optionheader"; + after: "optionheader_close_set"; + } + program { name: "optionheader_close_set"; + signal: "elm,state,optionheader,close_set"; + source: ""; + script { + set_int(oh_close, 1); + } + } + program { name: "optionheader_open_set"; + signal: "elm,state,optionheader,open_set"; + source: ""; + script { + set_int(oh_close, 0); + } } program { name: "show_finished"; action: SIGNAL_EMIT "elm,action,show,finished" ""; @@ -444,10 +463,8 @@ if (get_int(oh_show) == 1) { if (get_int(oh_close) == 1) { emit("elm,state,optionheader,open", ""); - set_int(oh_close, 0); }else { emit("elm,state,optionheader,close", ""); - set_int(oh_close, 1); } }//if }//script @@ -456,6 +473,7 @@ } } group { name:"elm/naviframe/item/basic2/default"; + alias:"elm/naviframe/item/2line/default"; images { image: "naviframe_optionheader.png" COMP; image: "naviframe_optionheader_arrow.png" COMP; @@ -707,7 +725,6 @@ type: IMAGE; mouse_events: 0; scale: 1; - clip_to: "title_clip"; description { state: "default" 0.0; min: NAVIFRAME_OH_ARROW_SIZE_INC; max: NAVIFRAME_OH_ARROW_SIZE_INC; @@ -821,6 +838,7 @@ target: "optionheader_shadow"; target: "elm.swallow.optionheader"; transition: LINEAR 0.2; + after: "optionheader_open_set"; } program { name: "optionheader_close"; signal: "elm,state,optionheader,close"; @@ -830,6 +848,7 @@ target: "optionheader_shadow"; target: "elm.swallow.optionheader"; transition: LINEAR 0.2; + after: "optionheader_close_set"; } program { name: "optionheader_instant_open"; signal: "elm,state,optionheader,instant_open"; @@ -838,6 +857,7 @@ target: "optionheader_clip"; target: "optionheader_shadow"; target: "elm.swallow.optionheader"; + after: "optionheader_open_set"; } program { name: "optionheader_instant_close"; signal: "elm,state,optionheader,instant_close"; @@ -846,6 +866,21 @@ target: "optionheader_clip"; target: "optionheader_shadow"; target: "elm.swallow.optionheader"; + after: "optionheader_close_set"; + } + program { name: "optionheader_close_set"; + signal: "elm,state,optionheader,close_set"; + source: ""; + script { + set_int(oh_close, 1); + } + } + program { name: "optionheader_open_set"; + signal: "elm,state,optionheader,open_set"; + source: ""; + script { + set_int(oh_close, 0); + } } program { name: "show_finished"; action: SIGNAL_EMIT "elm,action,show,finished" ""; @@ -867,10 +902,8 @@ if (get_int(oh_show) == 1) { if (get_int(oh_close) == 1) { emit("elm,state,optionheader,open", ""); - set_int(oh_close, 0); }else { emit("elm,state,optionheader,close", ""); - set_int(oh_close, 1); } }//if }//script @@ -879,6 +912,11 @@ } } group { name:"elm/naviframe/item/instant/default"; + images { + image: "naviframe_optionheader.png" COMP; + image: "naviframe_optionheader_arrow.png" COMP; + image: "naviframe_optionheader_shadow.png" COMP; + } script { public oh_show = 0; //optionheader show/hide public oh_close = 0; //optionheader close/open @@ -1223,6 +1261,7 @@ target: "optionheader_shadow"; target: "elm.swallow.optionheader"; transition: LINEAR 0.2; + after: "optionheader_open_set"; } program { name: "optionheader_close"; signal: "elm,state,optionheader,close"; @@ -1232,6 +1271,7 @@ target: "optionheader_shadow"; target: "elm.swallow.optionheader"; transition: LINEAR 0.2; + after: "optionheader_close_set"; } program { name: "optionheader_instant_open"; signal: "elm,state,optionheader,instant_open"; @@ -1240,6 +1280,7 @@ target: "optionheader_clip"; target: "optionheader_shadow"; target: "elm.swallow.optionheader"; + after: "optionheader_open_set"; } program { name: "optionheader_instant_close"; signal: "elm,state,optionheader,instant_close"; @@ -1248,10 +1289,34 @@ target: "optionheader_clip"; target: "optionheader_shadow"; target: "elm.swallow.optionheader"; + after: "optionheader_close_set"; + } + program { name: "optionheader_close_set"; + signal: "elm,state,optionheader,close_set"; + source: ""; + script { + set_int(oh_close, 1); + } + } + program { name: "optionheader_open_set"; + signal: "elm,state,optionheader,open_set"; + source: ""; + script { + set_int(oh_close, 0); + } } program { name: "title_clicked_signal"; action: SIGNAL_EMIT "elm,action,title,clicked" ""; } + program { name: "show_finished"; + action: SIGNAL_EMIT "elm,action,show,finished" ""; + } + program { name: "pushed_finished"; + action: SIGNAL_EMIT "elm,action,pushed,finished" ""; + } + program { name: "popped_finished"; + action: SIGNAL_EMIT "elm,action,popped,finished" ""; + } program { name: "title_clicked"; signal: "mouse,clicked,1"; @@ -1260,15 +1325,412 @@ if (get_int(oh_show) == 1) { if (get_int(oh_close) == 1) { emit("elm,state,optionheader,open", ""); - set_int(oh_close, 0); }else { emit("elm,state,optionheader,close", ""); - set_int(oh_close, 1); } }//if }//script after: "title_clicked_signal"; } + } + } + group { name:"elm/naviframe/item/instant2/default"; + images { + image: "naviframe_optionheader.png" COMP; + image: "naviframe_optionheader_arrow.png" COMP; + image: "naviframe_optionheader_shadow.png" COMP; + } + script { + public oh_show = 0; //optionheader show/hide + public oh_close = 0; //optionheader close/open + } + parts { + part { name: "title_clip"; + type: RECT; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + min: 1 NAVIFRAME_TITLE_H_INC; + align: 0.0 0.0; + fixed: 0 1; + rel1 { relative: 0.0 0.0; } + rel2 { relative: 1.0 0.0; } + } + description { state: "hide" 0.0; + inherit: "default" 0.0; + min: 0 0; + max: 0 0; + fixed: 1 1; + } + } + part { name: "optionheader_clip"; + type: RECT; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + min: 1 NAVIFRAME_OH_CLOSED_H_INC; + align: 0.5 0; + fixed: 0 1; + rel1 { to: "title_clip"; relative: 0 1; } + rel2 { to: "title_clip"; relative: 1 1; } + } + description { state: "show" 0.0; + inherit: "default" 0.0; + min: 1 NAVIFRAME_OH_OPENED_DOUBLE_H_INC; + } + } + part { name: "optionheader_bg"; + type: IMAGE; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + rel1 { to: "optionheader_clip"; } + rel2 { to: "optionheader_clip"; } + image { normal: "naviframe_optionheader.png"; + border: 0 0 1 0; + } + } + } + part { name: "elm.swallow.optionheader"; + type: SWALLOW; + scale: 1; + clip_to: "optionheader_clip"; + description { state: "default" 0.0; + min: 1 NAVIFRAME_OH_OPENED_DOUBLE_H_INC; + rel1.to: "optionheader_bg"; + rel2.to: "optionheader_bg"; + rel2.relative: 1 0; + fixed: 0 1; + align: 0.5 0; + visible: 0; + } + description { state: "show" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + part { name: "content_clip"; + type: RECT; + mouse_events: 0; + description { state: "default" 0.0; + rel1.to_y: "optionheader_bg"; + rel1.relative: 0 1; + } + } + part { name: "elm.swallow.content"; + type: SWALLOW; + scale: 1; + repeat_events: 0; + clip_to: "content_clip"; + description { state: "default" 0.0; + align: 0.0 0.0; + rel1.relative: 0.0 1.0; + rel1.to_y: "optionheader_bg"; + rel2.relative: 1.0 1.0; + visible: 0; + } + description { state: "show" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + part { name: "title_base"; + type: RECT; + clip_to: "title_clip"; + scale: 1; + description { state: "default" 0.0; + min: 1 NAVIFRAME_TITLE_H_INC; + align: 0.5 0.0; + fixed: 0 1; + rel1 { relative: 0.0 0.0; } + rel2 { relative: 1.0 0.0; } + color: NAVIFRAME_TITLE_BG_COLOR_INC; + } + } + part { name: "elm.rect.pada"; + type: RECT; + mouse_events: 0; + scale: 1; + clip_to: "title_clip"; + description { state: "default" 0.0; + min: NAVIFRAME_INDICATOR_W_INC 0; + fixed: 1 0; + align: 0.0 0.5; + rel1 { relative: 0.0 0.0; to: "title_base"; } + rel2 { relative: 0.0 1.0; to: "title_base"; } + visible: 0; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + min: NAVIFRAME_PADDING_EXPANDED_INC 0; + } + } + part { name: "separator_1"; + type: RECT; + mouse_events: 0; + scale: 1; + clip_to: "title_clip"; + description { state: "default" 0.0; + align: 1.0 0; + min: 1 0; + rel1 { relative: 0.0 0.2; to:"elm.rect.padb"; to: "title_base"; } + rel2 { relative: 0.0 0.8; to:"elm.rect.padb"; to: "title_base"; } + fixed: 1 0; + color: NAVIFRAME_TITLE_RIGHT_SEPARATOR_COLOR_INC; + } + } + part { name: "separator_2"; + type: RECT; + mouse_events: 0; + scale: 1; + clip_to: "title_clip"; + description { state: "default" 0.0; + align: 1.0 0; + min: 1 0; + rel1 { relative: 0.0 0.0; to: "separator_1"; to: "title_base"; } + rel2 { relative: 0.0 1.0; to: "separator_1"; to: "title_base"; } + fixed: 1 0; + color: NAVIFRAME_TITLE_LEFT_SEPARATOR_COLOR_INC; + } + } + part { name: "elm.rect.padb"; + type: RECT; + mouse_events: 0; + scale: 1; + clip_to: "title_clip"; + description { state: "default" 0.0; + min: NAVIFRAME_INDICATOR_W_INC 0; + fixed: 1 0; + align: 1.0 0.5; + rel1 { relative: 1.0 0.0; to: "title_base"; } + rel2 { relative: 1.0 1.0; to: "title_base"; } + visible: 0; + } + } + part { name: "elm.text.title"; + type: TEXT; + scale: 1; + clip_to: "title_clip"; + description { state: "default" 0.0; + text { font: "SLP:style=Medium"; + size: NAVIFRAME_TITLE_FONT_SIZE_INC; + min: 0 0; + max: 1 0; + align: 0.5 0.5; + } + color: NAVIFRAME_TITLE_TEXT_COLOR_INC; + align: 0.5 0.5; + rel1.to: "title_base"; + rel2.to: "title_base"; + } + } + part { name: "click_event_area"; + ignore_flags: ON_HOLD; + description { state: "default" 0.0; + rel1 { to: "title_base"; } + rel2 { to: "elm.rect.padb"; relative: 0.0 1.0; } + } + } + part { name: "elm.swallow.prev_btn"; + type: SWALLOW; + scale: 1; + clip_to: "title_clip"; + description { state: "default" 0.0; + align: 0 0.5; + fixed: 1 1; + rel1 { relative: 0.0 0.0; to: "title_base"; } + rel2 { relative: 0.0 1.0; to: "title_base"; } + } + } + part { name: "elm.swallow.icon"; + type: SWALLOW; + scale: 1; + clip_to: "title_clip"; + description { state: "default" 0.0; + max: NAVIFRAME_ICON_SIZE_INC; + rel1 { relative: 0.0 0.0; to_x: "padding_before_text"; } + rel2 { relative: 0.0 1.0; to_x: "padding_before_text"; } + aspect: 1.0 1.0; + aspect_preference: VERTICAL; + align: 1.0 0.5; + } + } + part { name: "padding_before_text"; + type: RECT; + scale: 1; + mouse_events: 0; + clip_to: "title_clip"; + description { state: "default" 0.0; + align: 1.0 0.5; + rel1 { relative: 0.0 0.0; to_x: "elm.text.title"; } + rel2 { relative: 0.0 1.0; to_x: "elm.text.title"; } + fixed: 1 0; + min: NAVIFRAME_ICON_PADDING_INC; + visible: 0; + } + } + part { name: "optionheader_arrow"; + type: IMAGE; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + min: NAVIFRAME_OH_ARROW_SIZE_INC; + max: NAVIFRAME_OH_ARROW_SIZE_INC; + fixed: 1 1; + align: 0.5 1; + visible: 0; + rel1.relative: 0 0; + rel1.to: "optionheader_bg"; + rel1.offset: 0 1; + rel2.relative: 1 0; + rel2.to: "optionheader_bg"; + rel2.offset: -1 0; + image { + normal: "00_winset_control_top_arrow.png"; + } + } + description { state: "show" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + part { name: "optionheader_shadow"; + type: IMAGE; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + min: 1 NAVIFRAME_OH_SHADOW_H_INC; + fixed: 0 1; + align: 0.5 0; + color: 255 255 255 0; + rel1 { to: "optionheader_bg"; relative: 0 1; } + rel2 { to: "optionheader_bg"; relative: 1 1; } + image { normal: "navibar_item_separator_shadow.png"; } + } + description { state: "show" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } + } + } + programs { + program { name: "show"; + signal: "elm,state,show"; + source: "elm"; + action: STATE_SET "show" 0.0; + target: "elm.swallow.content"; + after: "show_finished"; + } + program { name: "pushed"; + signal: "elm,state,pushed"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.swallow.content"; + after: "pushed_finished"; + } + program { name: "popped"; + signal: "elm,state,popped"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.swallow.content"; + after: "popped_finished"; + } + program { name: "visible"; + signal: "elm,state,visible"; + source: "elm"; + action: STATE_SET "show" 0.0; + target: "elm.swallow.content"; + } + program { name: "title_show"; + signal: "elm,state,title,show"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "title_clip"; + } + program { name: "title_hide"; + signal: "elm,state,title,hide"; + source: "elm"; + action: STATE_SET "hide" 0.0; + target: "title_clip"; + } + program { name: "optionheader_show"; + signal: "elm,state,elm.swallow.optionheader,show"; + source: "elm"; + script { + set_state(PART:"optionheader_clip", "show", 0.0); + set_state(PART:"optionheader_shadow", "show", 0.0); + set_state(PART:"optionheader_arrow", "show", 0.0); + set_state(PART:"elm.swallow.optionheader", "show", 0.0); + set_int(oh_show, 1); + emit("elm,state,optionheader_arrow,show", ""); + } + } + program { name: "optionheader_hide"; + signal: "elm,state,elm.swallow.optionheader,hide"; + source: "elm"; + script { + set_state(PART:"optionheader_clip", "default", 0.0); + set_state(PART:"optionheader_arrow", "default", 0.0); + set_state(PART:"optionheader_shadow", "default", 0.0); + set_state(PART:"elm.swallow.optionheader", "default", 0.0); + set_int(oh_show, 0); + } + } + program { name: "optionheader_open"; + signal: "elm,state,optionheader,open"; + source: ""; + action: STATE_SET "show" 0.0; + target: "optionheader_clip"; + target: "optionheader_shadow"; + target: "elm.swallow.optionheader"; + transition: LINEAR 0.2; + after: "optionheader_open_set"; + } + program { name: "optionheader_close"; + signal: "elm,state,optionheader,close"; + source: ""; + action: STATE_SET "default" 0.0; + target: "optionheader_clip"; + target: "optionheader_shadow"; + target: "elm.swallow.optionheader"; + transition: LINEAR 0.2; + after: "optionheader_close_set"; + } + program { name: "optionheader_instant_open"; + signal: "elm,state,optionheader,instant_open"; + source: ""; + action: STATE_SET "show" 0.0; + target: "optionheader_clip"; + target: "optionheader_shadow"; + target: "elm.swallow.optionheader"; + after: "optionheader_open_set"; + } + program { name: "optionheader_instant_close"; + signal: "elm,state,optionheader,instant_close"; + source: ""; + action: STATE_SET "default" 0.0; + target: "optionheader_clip"; + target: "optionheader_shadow"; + target: "elm.swallow.optionheader"; + after: "optionheader_close_set"; + } + program { name: "optionheader_close_set"; + signal: "elm,state,optionheader,close_set"; + source: ""; + script { + set_int(oh_close, 1); + } + } + program { name: "optionheader_open_set"; + signal: "elm,state,optionheader,open_set"; + source: ""; + script { + set_int(oh_close, 0); + } + } + program { name: "title_clicked_signal"; + action: SIGNAL_EMIT "elm,action,title,clicked" ""; + } program { name: "show_finished"; action: SIGNAL_EMIT "elm,action,show,finished" ""; } @@ -1278,5 +1740,20 @@ program { name: "popped_finished"; action: SIGNAL_EMIT "elm,action,popped,finished" ""; } + program { + name: "title_clicked"; + signal: "mouse,clicked,1"; + source: "click_event_area"; + script { + if (get_int(oh_show) == 1) { + if (get_int(oh_close) == 1) { + emit("elm,state,optionheader,open", ""); + }else { + emit("elm,state,optionheader,close", ""); + } + }//if + }//script + after: "title_clicked_signal"; + } } }