From 8cdea2af03253eda0b574b2590426f23d23fa233 Mon Sep 17 00:00:00 2001 From: Shilpa Singh Date: Fri, 7 Oct 2011 17:40:49 +0900 Subject: [PATCH] [elc_naviframe]: Issue fix: when title is hidden option header is not hidden. Change-Id: Ie26729ac2832bf1d8f4b15dfd6e5dfead6c198d2 --- themes/groups/naviframe.edc | 120 +++++++++++++++++++++++++++++++------------- 1 file changed, 84 insertions(+), 36 deletions(-) diff --git a/themes/groups/naviframe.edc b/themes/groups/naviframe.edc index 263e1cf..1ff5dd6 100644 --- a/themes/groups/naviframe.edc +++ b/themes/groups/naviframe.edc @@ -80,6 +80,12 @@ inherit: "default" 0.0; min: 1 NAVIFRAME_OH_OPENED_H_INC; } + description { state: "hide" 0.0; + inherit: "default" 0.0; + min: 0 0; + max: 0 0; + fixed: 1 1; + } } part { name: "optionheader_bg"; type: IMAGE; @@ -167,14 +173,9 @@ } 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; } + rel1 { to: "title_clip"; } + rel2 { to: "title_clip"; } color: NAVIFRAME_TITLE_BG_COLOR_INC; } } @@ -399,14 +400,25 @@ program { name: "title_show"; signal: "elm,state,title,show"; source: "elm"; - action: STATE_SET "default" 0.0; - target: "title_clip"; + script { + set_state(PART:"title_clip", "default", 0.0); + if (get_int(oh_show) == 1) { + if (get_int(oh_close) == 1) { + emit("elm,state,optionheader,instant_close", ""); + }else { + emit("elm,state,optionheader,instant_open", ""); + } + } + else + set_state(PART:"optionheader_clip", "default", 0.0); + } } program { name: "title_hide"; signal: "elm,state,title,hide"; source: "elm"; action: STATE_SET "hide" 0.0; target: "title_clip"; + target: "optionheader_clip"; } program { name: "optionheader_show"; signal: "elm,state,elm.swallow.optionheader,show"; @@ -553,6 +565,12 @@ inherit: "default" 0.0; min: 1 NAVIFRAME_OH_OPENED_DOUBLE_H_INC; } + description { state: "hide" 0.0; + inherit: "default" 0.0; + min: 0 0; + max: 0 0; + fixed: 1 1; + } } part { name: "optionheader_bg"; type: IMAGE; @@ -670,14 +688,9 @@ } 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; } + rel1 { to: "title_clip"; } + rel2 { to: "title_clip"; } color: NAVIFRAME_TITLE_BG_COLOR_INC; } } @@ -902,14 +915,25 @@ program { name: "title_show"; signal: "elm,state,title,show"; source: "elm"; - action: STATE_SET "default" 0.0; - target: "title_clip"; + script { + set_state(PART:"title_clip", "default", 0.0); + if (get_int(oh_show) == 1) { + if (get_int(oh_close) == 1) { + emit("elm,state,optionheader,instant_close", ""); + }else { + emit("elm,state,optionheader,instant_open", ""); + } + } + else + set_state(PART:"optionheader_clip", "default", 0.0); + } } program { name: "title_hide"; signal: "elm,state,title,hide"; source: "elm"; action: STATE_SET "hide" 0.0; target: "title_clip"; + target: "optionheader_clip"; } program { name: "optionheader_show"; signal: "elm,state,elm.swallow.optionheader,show"; @@ -1058,6 +1082,12 @@ inherit: "default" 0.0; min: 1 NAVIFRAME_OH_OPENED_H_INC; } + description { state: "hide" 0.0; + inherit: "default" 0.0; + min: 0 0; + max: 0 0; + fixed: 1 1; + } } part { name: "optionheader_bg"; type: IMAGE; @@ -1135,14 +1165,9 @@ } 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; } + rel1 { to: "title_clip"; } + rel2 { to: "title_clip"; } color: NAVIFRAME_TITLE_BG_COLOR_INC; } } @@ -1332,14 +1357,25 @@ program { name: "title_show"; signal: "elm,state,title,show"; source: "elm"; - action: STATE_SET "default" 0.0; - target: "title_clip"; + script { + set_state(PART:"title_clip", "default", 0.0); + if (get_int(oh_show) == 1) { + if (get_int(oh_close) == 1) { + emit("elm,state,optionheader,instant_close", ""); + }else { + emit("elm,state,optionheader,instant_open", ""); + } + } + else + set_state(PART:"optionheader_clip", "default", 0.0); + } } program { name: "title_hide"; signal: "elm,state,title,hide"; source: "elm"; action: STATE_SET "hide" 0.0; target: "title_clip"; + target: "optionheader_clip"; } program { name: "optionheader_show"; signal: "elm,state,elm.swallow.optionheader,show"; @@ -1483,6 +1519,12 @@ inherit: "default" 0.0; min: 1 NAVIFRAME_OH_OPENED_DOUBLE_H_INC; } + description { state: "hide" 0.0; + inherit: "default" 0.0; + min: 0 0; + max: 0 0; + fixed: 1 1; + } } part { name: "optionheader_bg"; type: IMAGE; @@ -1591,14 +1633,9 @@ } 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; } + rel1 { to: "title_clip"; } + rel2 { to: "title_clip"; } color: NAVIFRAME_TITLE_BG_COLOR_INC; } } @@ -1788,14 +1825,25 @@ program { name: "title_show"; signal: "elm,state,title,show"; source: "elm"; - action: STATE_SET "default" 0.0; - target: "title_clip"; + script { + set_state(PART:"title_clip", "default", 0.0); + if (get_int(oh_show) == 1) { + if (get_int(oh_close) == 1) { + emit("elm,state,optionheader,instant_close", ""); + }else { + emit("elm,state,optionheader,instant_open", ""); + } + } + else + set_state(PART:"optionheader_clip", "default", 0.0); + } } program { name: "title_hide"; signal: "elm,state,title,hide"; source: "elm"; action: STATE_SET "hide" 0.0; target: "title_clip"; + target: "optionheader_clip"; } program { name: "optionheader_show"; signal: "elm,state,elm.swallow.optionheader,show"; -- 2.7.4