From cc81d243259dc99da80d2d1371690d0f2037fb0e Mon Sep 17 00:00:00 2001 From: ChunEon Park Date: Thu, 17 Nov 2011 21:55:46 +0900 Subject: [PATCH] naviframe - removed circular dependency Change-Id: I4419b27e2c6cb1e61f52bcef42f1b3b846d954d3 --- themes/groups/naviframe.edc | 110 +++++++++++++++++++------------------------- 1 file changed, 48 insertions(+), 62 deletions(-) diff --git a/themes/groups/naviframe.edc b/themes/groups/naviframe.edc index b7186e0..84e01ed 100644 --- a/themes/groups/naviframe.edc +++ b/themes/groups/naviframe.edc @@ -66,10 +66,8 @@ min: 1 0; align: 0.5 0; fixed: 0 1; - rel1.to_x: "elm.swallow.content"; rel1.to_y: "title_clip"; rel1.relative: 0 1; - rel2.to_x: "elm.swallow.content"; rel2.to_y: "title_clip"; visible: 0; } @@ -95,6 +93,16 @@ border: 0 0 4 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: "optionheader_top_padding"; type: RECT; @@ -149,20 +157,11 @@ 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 0.0; + rel1.to: "optionheader_bg"; + rel2.relative: 1.0 1.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; @@ -386,8 +385,8 @@ align: 0.5 1; color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC; visible: 0; - rel1.to_x: "elm.swallow.content"; - rel2.to_x: "elm.swallow.content"; + rel1.to_x: "optionheader_bg"; + rel2.to_x: "optionheader_bg"; } description { state: "show" 0.0; inherit: "default" 0.0; @@ -441,7 +440,7 @@ signal: "elm,state,new,pushed,internal"; source: ""; action: STATE_SET "default" 0.0; - target: "elm.swallow.content"; + target: "optionheader_bg"; transition: DECELERATE 0.5; after: "show_finished"; } @@ -449,7 +448,7 @@ signal: "elm,state,cur,pushed,internal"; source: ""; action: STATE_SET "left" 0.0; - target: "elm.swallow.content"; + target: "optionheader_bg"; transition: DECELERATE 0.5; after: "pushed_finished"; } @@ -457,7 +456,7 @@ signal: "elm,state,prev,popped,internal"; source: ""; action: STATE_SET "default" 0.0; - target: "elm.swallow.content"; + target: "optionheader_bg"; transition: DECELERATE 0.5; after: "show_finished"; } @@ -465,7 +464,7 @@ signal: "elm,state,cur,popped,internal"; source: ""; action: STATE_SET "right" 0.0; - target: "elm.swallow.content"; + target: "optionheader_bg"; transition: DECELERATE 0.5; after: "popped_finished"; } @@ -473,7 +472,7 @@ signal: "elm,state,cur,pushed"; source: "elm"; script { - set_state(PART:"elm.swallow.content", "default", 0.0); + set_state(PART:"optionheader_bg", "default", 0.0); emit("elm,state,cur,pushed,internal", ""); } } @@ -481,7 +480,7 @@ signal: "elm,state,new,pushed"; source: "elm"; script { - set_state(PART:"elm.swallow.content", "right", 0.0); + set_state(PART:"optionheader_bg", "right", 0.0); emit("elm,state,new,pushed,internal", ""); } } @@ -489,7 +488,7 @@ signal: "elm,state,prev,popped"; source: "elm"; script { - set_state(PART:"elm.swallow.content", "left", 0.0); + set_state(PART:"optionheader_bg", "left", 0.0); emit("elm,state,prev,popped,internal", ""); } } @@ -497,7 +496,7 @@ signal: "elm,state,cur,popped"; source: "elm"; script { - set_state(PART:"elm.swallow.content", "default", 0.0); + set_state(PART:"optionheader_bg", "default", 0.0); emit("elm,state,cur,popped,internal", ""); } } @@ -505,7 +504,7 @@ signal: "elm,state,visible"; source: "elm"; action: STATE_SET "default" 0.0; - target: "elm.swallow.content"; + target: "optionheader_bg"; } program { name: "title_show"; signal: "elm,state,title,show"; @@ -736,10 +735,8 @@ min: 1 0; align: 0.5 0; fixed: 0 1; - rel1.to_x: "elm.swallow.content"; rel1.to_y: "title_clip"; rel1.relative: 0 1; - rel2.to_x: "elm.swallow.content"; rel2.to_y: "title_clip"; visible: 0; } @@ -765,6 +762,16 @@ border: 0 0 4 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: "optionheader_top_padding"; type: RECT; @@ -844,20 +851,11 @@ 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 0.0; + rel1.to: "optionheader_bg"; + rel2.relative: 1.0 1.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; @@ -1081,8 +1079,8 @@ align: 0.5 1; color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC; visible: 0; - rel1.to_x: "elm.swallow.content"; - rel2.to_x: "elm.swallow.content"; + rel1.to_x: "optionheader_bg"; + rel2.to_x: "optionheader_bg"; } description { state: "show" 0.0; inherit: "default" 0.0; @@ -1136,7 +1134,7 @@ signal: "elm,state,new,pushed,internal"; source: ""; action: STATE_SET "default" 0.0; - target: "elm.swallow.content"; + target: "optionheader_bg"; transition: DECELERATE 0.5; after: "show_finished"; } @@ -1144,7 +1142,7 @@ signal: "elm,state,cur,pushed,internal"; source: ""; action: STATE_SET "left" 0.0; - target: "elm.swallow.content"; + target: "optionheader_bg"; transition: DECELERATE 0.5; after: "pushed_finished"; } @@ -1152,7 +1150,7 @@ signal: "elm,state,prev,popped,internal"; source: ""; action: STATE_SET "default" 0.0; - target: "elm.swallow.content"; + target: "optionheader_bg"; transition: DECELERATE 0.5; after: "show_finished"; } @@ -1160,7 +1158,7 @@ signal: "elm,state,cur,popped,internal"; source: ""; action: STATE_SET "right" 0.0; - target: "elm.swallow.content"; + target: "optionheader_bg"; transition: DECELERATE 0.5; after: "popped_finished"; } @@ -1168,7 +1166,7 @@ signal: "elm,state,cur,pushed"; source: "elm"; script { - set_state(PART:"elm.swallow.content", "default", 0.0); + set_state(PART:"optionheader_bg", "default", 0.0); emit("elm,state,cur,pushed,internal", ""); } } @@ -1176,7 +1174,7 @@ signal: "elm,state,new,pushed"; source: "elm"; script { - set_state(PART:"elm.swallow.content", "right", 0.0); + set_state(PART:"optionheader_bg", "right", 0.0); emit("elm,state,new,pushed,internal", ""); } } @@ -1184,7 +1182,7 @@ signal: "elm,state,prev,popped"; source: "elm"; script { - set_state(PART:"elm.swallow.content", "left", 0.0); + set_state(PART:"optionheader_bg", "left", 0.0); emit("elm,state,prev,popped,internal", ""); } } @@ -1192,7 +1190,7 @@ signal: "elm,state,cur,popped"; source: "elm"; script { - set_state(PART:"elm.swallow.content", "default", 0.0); + set_state(PART:"optionheader_bg", "default", 0.0); emit("elm,state,cur,popped,internal", ""); } } @@ -1200,7 +1198,7 @@ signal: "elm,state,visible"; source: "elm"; action: STATE_SET "default" 0.0; - target: "elm.swallow.content"; + target: "optionheader_bg"; } program { name: "title_show"; signal: "elm,state,title,show"; @@ -2125,10 +2123,8 @@ min: 1 0; align: 0.5 0; fixed: 0 1; - rel1.to_x: "elm.swallow.content"; rel1.to_y: "title_clip"; rel1.relative: 0 1; - rel2.to_x: "elm.swallow.content"; rel2.to_y: "title_clip"; visible: 0; } @@ -2435,8 +2431,6 @@ align: 0.5 1; color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC; visible: 0; - rel1.to_x: "elm.swallow.content"; - rel2.to_x: "elm.swallow.content"; } description { state: "show" 0.0; inherit: "default" 0.0; @@ -2737,10 +2731,8 @@ min: 1 0; align: 0.5 0; fixed: 0 1; - rel1.to_x: "elm.swallow.content"; rel1.to_y: "title_clip"; rel1.relative: 0 1; - rel2.to_x: "elm.swallow.content"; rel2.to_y: "title_clip"; visible: 0; } @@ -3072,8 +3064,6 @@ align: 0.5 1; color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC; visible: 0; - rel1.to_x: "elm.swallow.content"; - rel2.to_x: "elm.swallow.content"; } description { state: "show" 0.0; inherit: "default" 0.0; @@ -3574,8 +3564,6 @@ align: 0.5 1; color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC; visible: 0; - rel1.to_x: "elm.swallow.content"; - rel2.to_x: "elm.swallow.content"; } description { state: "show" 0.0; inherit: "default" 0.0; @@ -3771,8 +3759,6 @@ align: 0.5 1; color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC; visible: 0; - rel1.to_x: "elm.swallow.content"; - rel2.to_x: "elm.swallow.content"; } description { state: "show" 0.0; inherit: "default" 0.0; -- 2.7.4