From fe6d5fc9b091ccd8ceac9dcf3ef771e135a3a647 Mon Sep 17 00:00:00 2001 From: WooHyun Jung Date: Mon, 14 Nov 2011 11:34:02 +0900 Subject: [PATCH] [*][naviframe] rollback to 11/9 because of not showing --- themes/groups/naviframe.edc | 202 ++++++++++++++++++++------------------------ 1 file changed, 91 insertions(+), 111 deletions(-) diff --git a/themes/groups/naviframe.edc b/themes/groups/naviframe.edc index 090cfcc..6896c6b 100644 --- a/themes/groups/naviframe.edc +++ b/themes/groups/naviframe.edc @@ -25,7 +25,6 @@ part { name: "base"; mouse_events: 0; description { state: "default" 0.0; - visible: 0; } } } @@ -42,22 +41,6 @@ public cbar_bg = 0; //Controlbar BG Show call count } parts { - part { name: "base"; - type: RECT; - description { state: "default" 0.0; - visible: 0; - } - description { state: "left" 0.0; - inherit: "default" 0.0; - rel1.relative: -1.0 0.0; - rel2.relative: 0.0 1.0; - } - description { state: "right" 0.0; - inherit: "default" 0.0; - rel1.relative: 1.0 0.0; - rel2.relative: 2.0 1.0; - } - } part { name: "title_clip"; type: RECT; mouse_events: 0; @@ -66,8 +49,8 @@ min: 1 NAVIFRAME_TITLE_H_INC; align: 0.0 0.0; fixed: 0 1; - rel1 { relative: 0.0 0.0; to: "base"; } - rel2 { relative: 1.0 0.0; to: "base"; } + rel1 { relative: 0.0 0.0; } + rel2 { relative: 1.0 0.0; } } description { state: "hide" 0.0; inherit: "default" 0.0; @@ -103,6 +86,7 @@ } part { name: "optionheader_bg"; type: IMAGE; + mouse_events: 0; scale: 1; description { state: "default" 0.0; rel1 { to: "optionheader_clip"; } @@ -158,9 +142,8 @@ type: RECT; mouse_events: 0; description { state: "default" 0.0; - rel1.to: "optionheader_bg"; + rel1.to_y: "optionheader_bg"; rel1.relative: 0 1; - rel2.to_x: "optionheader_bg"; } } part { name: "elm.swallow.content"; @@ -171,11 +154,20 @@ description { state: "default" 0.0; align: 0.0 0.0; rel1.relative: 0.0 1.0; - rel1.to: "optionheader_bg"; + rel1.to_y: "optionheader_bg"; rel2.relative: 1.0 0.0; - rel2.to_x: "optionheader_bg"; rel2.to_y: "controlbar_bg"; } + description { state: "left" 0.0; + inherit: "default" 0.0; + rel1.relative: -1.0 1.0; + rel2.relative: 0.0 0.0; + } + description { state: "right" 0.0; + inherit: "default" 0.0; + rel1.relative: 1.0 1.0; + rel2.relative: 2.0 0.0; + } } part { name: "title_base"; type: RECT; @@ -375,6 +367,7 @@ } part { name: "optionheader_arrow"; type: IMAGE; + mouse_events: 0; scale: 1; description { state: "default" 0.0; min: NAVIFRAME_OH_ARROW_SIZE_INC; @@ -463,19 +456,19 @@ } } programs { - program { name: "content_new_pushed"; + program { name: "content_new_pusehd"; signal: "elm,state,new,pushed,internal"; source: ""; action: STATE_SET "default" 0.0; - target: "base"; + target: "elm.swallow.content"; transition: DECELERATE 0.5; after: "show_finished"; } - program { name: "content_cur_pushed"; + program { name: "content_cur_pusehd"; signal: "elm,state,cur,pushed,internal"; source: ""; action: STATE_SET "left" 0.0; - target: "base"; + target: "elm.swallow.content"; transition: DECELERATE 0.5; after: "pushed_finished"; } @@ -483,7 +476,7 @@ signal: "elm,state,prev,popped,internal"; source: ""; action: STATE_SET "default" 0.0; - target: "base"; + target: "elm.swallow.content"; transition: DECELERATE 0.5; after: "show_finished"; } @@ -491,7 +484,7 @@ signal: "elm,state,cur,popped,internal"; source: ""; action: STATE_SET "right" 0.0; - target: "base"; + target: "elm.swallow.content"; transition: DECELERATE 0.5; after: "popped_finished"; } @@ -499,7 +492,7 @@ signal: "elm,state,cur,pushed"; source: "elm"; script { - set_state(PART:"base", "default", 0.0); + set_state(PART:"elm.swallow.content", "default", 0.0); emit("elm,state,cur,pushed,internal", ""); } } @@ -507,7 +500,7 @@ signal: "elm,state,new,pushed"; source: "elm"; script { - set_state(PART:"base", "right", 0.0); + set_state(PART:"elm.swallow.content", "right", 0.0); emit("elm,state,new,pushed,internal", ""); } } @@ -515,7 +508,7 @@ signal: "elm,state,prev,popped"; source: "elm"; script { - set_state(PART:"base", "left", 0.0); + set_state(PART:"elm.swallow.content", "left", 0.0); emit("elm,state,prev,popped,internal", ""); } } @@ -523,7 +516,7 @@ signal: "elm,state,cur,popped"; source: "elm"; script { - set_state(PART:"base", "default", 0.0); + set_state(PART:"elm.swallow.content", "default", 0.0); emit("elm,state,cur,popped,internal", ""); } } @@ -531,7 +524,7 @@ signal: "elm,state,visible"; source: "elm"; action: STATE_SET "default" 0.0; - target: "base"; + target: "elm.swallow.content"; } program { name: "title_show"; signal: "elm,state,title,show"; @@ -735,7 +728,8 @@ } } } - group { name:"elm/naviframe/item/basic2/default"; + +group { name:"elm/naviframe/item/basic2/default"; alias:"elm/naviframe/item/2line/default"; images { image: "naviframe_optionheader.png" COMP; @@ -747,22 +741,6 @@ public cbar_bg = 0; //Controlbar BG Show call count } parts { - part { name: "base"; - type: RECT; - description { state: "default" 0.0; - visible: 0; - } - description { state: "left" 0.0; - inherit: "default" 0.0; - rel1.relative: -1.0 0.0; - rel2.relative: 0.0 1.0; - } - description { state: "right" 0.0; - inherit: "default" 0.0; - rel1.relative: 1.0 0.0; - rel2.relative: 2.0 1.0; - } - } part { name: "title_clip"; type: RECT; mouse_events: 0; @@ -771,8 +749,8 @@ min: 1 NAVIFRAME_TITLE_H_INC; align: 0.0 0.0; fixed: 0 1; - rel1 { relative: 0.0 0.0; to: "base"; } - rel2 { relative: 1.0 0.0; to: "base"; } + rel1 { relative: 0.0 0.0; } + rel2 { relative: 1.0 0.0; } } description { state: "hide" 0.0; inherit: "default" 0.0; @@ -789,9 +767,11 @@ min: 1 0; align: 0.5 0; fixed: 0 1; - rel1.to: "title_clip"; + rel1.to_x: "elm.swallow.content"; + rel1.to_y: "title_clip"; rel1.relative: 0 1; - rel2.to: "title_clip"; + rel2.to_x: "elm.swallow.content"; + rel2.to_y: "title_clip"; visible: 0; } description { state: "show" 0.0; @@ -894,9 +874,8 @@ type: RECT; mouse_events: 0; description { state: "default" 0.0; - rel1.to: "optionheader_bg"; + rel1.to_y: "optionheader_bg"; rel1.relative: 0 1; - rel2.to_x: "optionheader_bg"; } } part { name: "elm.swallow.content"; @@ -907,11 +886,20 @@ description { state: "default" 0.0; align: 0.0 0.0; rel1.relative: 0.0 1.0; - rel1.to: "optionheader_bg"; + rel1.to_y: "optionheader_bg"; rel2.relative: 1.0 0.0; - rel2.to_x: "optionheader_bg"; rel2.to_y: "controlbar_bg"; } + description { state: "left" 0.0; + inherit: "default" 0.0; + rel1.relative: -1.0 1.0; + rel2.relative: 0.0 0.0; + } + description { state: "right" 0.0; + inherit: "default" 0.0; + rel1.relative: 1.0 1.0; + rel2.relative: 2.0 0.0; + } } part { name: "title_base"; type: RECT; @@ -1200,19 +1188,19 @@ } } programs { - program { name: "content_new_pushed"; + program { name: "content_new_pusehd"; signal: "elm,state,new,pushed,internal"; source: ""; action: STATE_SET "default" 0.0; - target: "base"; + target: "elm.swallow.content"; transition: DECELERATE 0.5; after: "show_finished"; } - program { name: "content_cur_pushed"; + program { name: "content_cur_pusehd"; signal: "elm,state,cur,pushed,internal"; source: ""; action: STATE_SET "left" 0.0; - target: "base"; + target: "elm.swallow.content"; transition: DECELERATE 0.5; after: "pushed_finished"; } @@ -1220,7 +1208,7 @@ signal: "elm,state,prev,popped,internal"; source: ""; action: STATE_SET "default" 0.0; - target: "base"; + target: "elm.swallow.content"; transition: DECELERATE 0.5; after: "show_finished"; } @@ -1228,7 +1216,7 @@ signal: "elm,state,cur,popped,internal"; source: ""; action: STATE_SET "right" 0.0; - target: "base"; + target: "elm.swallow.content"; transition: DECELERATE 0.5; after: "popped_finished"; } @@ -1236,7 +1224,7 @@ signal: "elm,state,cur,pushed"; source: "elm"; script { - set_state(PART:"base", "default", 0.0); + set_state(PART:"elm.swallow.content", "default", 0.0); emit("elm,state,cur,pushed,internal", ""); } } @@ -1244,7 +1232,7 @@ signal: "elm,state,new,pushed"; source: "elm"; script { - set_state(PART:"base", "right", 0.0); + set_state(PART:"elm.swallow.content", "right", 0.0); emit("elm,state,new,pushed,internal", ""); } } @@ -1252,7 +1240,7 @@ signal: "elm,state,prev,popped"; source: "elm"; script { - set_state(PART:"base", "left", 0.0); + set_state(PART:"elm.swallow.content", "left", 0.0); emit("elm,state,prev,popped,internal", ""); } } @@ -1260,7 +1248,7 @@ signal: "elm,state,cur,popped"; source: "elm"; script { - set_state(PART:"base", "default", 0.0); + set_state(PART:"elm.swallow.content", "default", 0.0); emit("elm,state,cur,popped,internal", ""); } } @@ -1483,22 +1471,6 @@ public cbar_bg = 0; //Controlbar BG Show call count } parts { - part { name: "base"; - type: RECT; - description { state: "default" 0.0; - visible: 0; - } - description { state: "left" 0.0; - inherit: "default" 0.0; - rel1.relative: -1.0 0.0; - rel2.relative: 0.0 1.0; - } - description { state: "right" 0.0; - inherit: "default" 0.0; - rel1.relative: 1.0 0.0; - rel2.relative: 2.0 1.0; - } - } part { name: "title_clip"; type: RECT; mouse_events: 0; @@ -1507,8 +1479,8 @@ min: 1 NAVIFRAME_SEGMENT_TITLE_H_INC; align: 0.0 0.0; fixed: 0 1; - rel1 { relative: 0.0 0.0; to: "base"; } - rel2 { relative: 1.0 0.0; to: "base"; } + rel1 { relative: 0.0 0.0; } + rel2 { relative: 1.0 0.0; } } description { state: "hide" 0.0; inherit: "default" 0.0; @@ -1521,9 +1493,8 @@ type: RECT; mouse_events: 0; description { state: "default" 0.0; - rel1.to: "title_clip"; + rel1.to_y: "title_clip"; rel1.relative: 0 1; - rel2.to_x: "title_clip"; } } part { name: "elm.swallow.content"; @@ -1534,11 +1505,20 @@ description { state: "default" 0.0; align: 0.0 0.0; rel1.relative: 0.0 1.0; - rel1.to: "title_clip"; + rel1.to_y: "title_clip"; rel2.relative: 1.0 0.0; - rel2.to_x: "title_clip"; rel2.to_y: "controlbar_bg"; } + description { state: "left" 0.0; + inherit: "default" 0.0; + rel1.relative: -1.0 1.0; + rel2.relative: 0.0 0.0; + } + description { state: "right" 0.0; + inherit: "default" 0.0; + rel1.relative: 1.0 1.0; + rel2.relative: 2.0 0.0; + } } part { name: "title_base"; type: RECT; @@ -1708,10 +1688,8 @@ max: 999999 NAVIFRAME_TITLE_SEGMENT_H_INC; fixed: 0 1; align: 0.5 0; - rel1.to_x: "title_clip"; rel1.to_y: "elm.text.title"; rel1.relative: 0.28 1; - rel2.to_x: "title_clip"; rel2.to_y: "elm.text.title"; rel2.relative: 0.72 1; } @@ -1725,10 +1703,8 @@ max: 999999 NAVIFRAME_TITLE_SEGMENT_H_INC; fixed: 0 1; align: 0.5 0; - rel1.to_x: "title_clip"; rel1.to_y: "elm.text.title"; rel1.relative: 0.2 1; - rel2.to_x: "title_clip"; rel2.to_y: "elm.text.title"; rel2.relative: 0.8 1; } @@ -1801,19 +1777,19 @@ } } programs { - program { name: "content_new_pushed"; + program { name: "content_new_pusehd"; signal: "elm,state,new,pushed,internal"; source: ""; action: STATE_SET "default" 0.0; - target: "base"; + target: "elm.swallow.content"; transition: DECELERATE 0.5; after: "show_finished"; } - program { name: "content_cur_pushed"; + program { name: "content_cur_pusehd"; signal: "elm,state,cur,pushed,internal"; source: ""; action: STATE_SET "left" 0.0; - target: "base"; + target: "elm.swallow.content"; transition: DECELERATE 0.5; after: "pushed_finished"; } @@ -1821,7 +1797,7 @@ signal: "elm,state,prev,popped,internal"; source: ""; action: STATE_SET "default" 0.0; - target: "base"; + target: "elm.swallow.content"; transition: DECELERATE 0.5; after: "show_finished"; } @@ -1829,7 +1805,7 @@ signal: "elm,state,cur,popped,internal"; source: ""; action: STATE_SET "right" 0.0; - target: "base"; + target: "elm.swallow.content"; transition: DECELERATE 0.5; after: "popped_finished"; } @@ -1837,7 +1813,7 @@ signal: "elm,state,cur,pushed"; source: "elm"; script { - set_state(PART:"base", "default", 0.0); + set_state(PART:"elm.swallow.content", "default", 0.0); emit("elm,state,cur,pushed,internal", ""); } } @@ -1845,7 +1821,7 @@ signal: "elm,state,new,pushed"; source: "elm"; script { - set_state(PART:"base", "right", 0.0); + set_state(PART:"elm.swallow.content", "right", 0.0); emit("elm,state,new,pushed,internal", ""); } } @@ -1853,7 +1829,7 @@ signal: "elm,state,prev,popped"; source: "elm"; script { - set_state(PART:"base", "left", 0.0); + set_state(PART:"elm.swallow.content", "left", 0.0); emit("elm,state,prev,popped,internal", ""); } } @@ -1861,7 +1837,7 @@ signal: "elm,state,cur,popped"; source: "elm"; script { - set_state(PART:"base", "default", 0.0); + set_state(PART:"elm.swallow.content", "default", 0.0); emit("elm,state,cur,popped,internal", ""); } } @@ -2069,7 +2045,7 @@ } } programs { - program { name: "content_new_pushed"; + program { name: "content_new_pusehd"; signal: "elm,state,new,pushed,internal"; source: ""; action: STATE_SET "default" 0.0; @@ -2077,7 +2053,7 @@ transition: DECELERATE 0.5; after: "show_finished"; } - program { name: "content_cur_pushed"; + program { name: "content_cur_pusehd"; signal: "elm,state,cur,pushed,internal"; source: ""; action: STATE_SET "left" 0.0; @@ -2247,9 +2223,11 @@ min: 1 0; align: 0.5 0; fixed: 0 1; - rel1.to: "title_clip"; + rel1.to_x: "elm.swallow.content"; + rel1.to_y: "title_clip"; rel1.relative: 0 1; - rel2.to: "title_clip"; + rel2.to_x: "elm.swallow.content"; + rel2.to_y: "title_clip"; visible: 0; } description { state: "show" 0.0; @@ -2887,9 +2865,11 @@ min: 1 0; align: 0.5 0; fixed: 0 1; - rel1.to: "title_clip"; + rel1.to_x: "elm.swallow.content"; + rel1.to_y: "title_clip"; rel1.relative: 0 1; - rel2.to: "title_clip"; + rel2.to_x: "elm.swallow.content"; + rel2.to_y: "title_clip"; visible: 0; } description { state: "show" 0.0; -- 2.7.4