From: chuneon.park Date: Thu, 24 Mar 2011 13:58:20 +0000 (+0900) Subject: removed indicator area from layout X-Git-Tag: 2.0_alpha~910^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4a513cfd019a1309a7b7ed6d23ef277f20101e01;p=framework%2Fuifw%2Fefl-theme-tizen.git removed indicator area from layout --- diff --git a/themes/groups/layout.edc b/themes/groups/layout.edc index 434442b..f4c3194 100644 --- a/themes/groups/layout.edc +++ b/themes/groups/layout.edc @@ -70,37 +70,6 @@ color: LAYOUT_EDIT_MODE_BG_COLOR_INC; } } - part { name: "indicator_bg"; - type: RECT; - scale: 1; - mouse_events: 0; - description { state: "default" 0.0; - visible: 0; - rel1.to: "elm.swallow.indicator"; - rel2.to: "elm.swallow.indicator"; - color: 0 0 0 255; - } - description { state: "show" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - part { name: "elm.swallow.indicator"; - type: SWALLOW; - scale: 1; - description { state: "default" 0.0; - visible: 0; - min: 0 INDICATOR_H; - fixed: 0 1; - rel1 { relative: 0.0 0.0; } - rel2 { relative: 1.0 0.0; } - align: 0.5 0.0; - } - description { state: "show" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } part { name: "elm.swallow.content"; type: SWALLOW; description { @@ -113,11 +82,6 @@ inherit: "default" 0.0; visible: 1; } - description { state: "show_with_indicator" 0.0; - inherit: "default" 0.0; - visible: 1; - rel1 { relative: 0.0 1.0; to_y: "elm.swallow.indicator"; } - } description { state: "show_with_navi_bar" 0.0; inherit: "default" 0.0; visible: 1; @@ -128,12 +92,6 @@ visible: 1; rel2 { relative: 1.0 0.0; to_y: "elm.swallow.controlbar"; } } - description { state: "show_with_indicator" 1.0; - inherit: "default" 0.0; - visible: 1; - rel1 { relative: 0.0 1.0; to_y: "elm.swallow.indicator"; } - rel2 { relative: 1.0 0.0; to_y: "elm.swallow.controlbar"; } - } description { state: "show_with_navi_bar" 1.0; inherit: "default" 0.0; visible: 1; @@ -157,12 +115,6 @@ inherit: "default" 0.0; visible: 1; } - description { state: "show_with_indicator" 0.0; - inherit: "default" 0.0; - visible: 1; - rel1 { relative: 0.0 1.0; to_y: "elm.swallow.indicator"; } - rel2 { relative: 1.0 1.0; to_y: "elm.swallow.indicator"; } - } } part { name: "elm.swallow.controlbar"; type: SWALLOW; @@ -243,24 +195,6 @@ set_state(PART:"base", "edit_mode", 0.0); } } - program { name: "show_indicator"; - signal: "elm,state,show,indicator"; - source: "elm"; - script { - set_state(PART:"elm.swallow.indicator", "show", 0.0); - set_state(PART:"indicator_bg", "show", 0.0); - run_program(PROGRAM:"check_location"); - } - } - program { name: "hide_indicator"; - signal: "elm,state,hide,indicator"; - source: "elm"; - script { - set_state(PART:"elm.swallow.indicator", "default", 0.0); - set_state(PART:"indicator_bg", "default", 0.0); - run_program(PROGRAM:"check_location"); - } - } program { name: "show_navi_bar"; signal: "elm,state,show,navi_bar"; source: "elm"; @@ -313,10 +247,8 @@ script { new st[30]; new Float:vl; - new indicator = 0, navi_bar = 0, content = 0, controlbar = 0; + new navi_bar = 0, content = 0, controlbar = 0; - get_state(PART:"elm.swallow.indicator", st, 30, vl) - if (!strncmp(st, "show", 4)) indicator = 1; get_state(PART:"elm.swallow.navi_bar", st, 30, vl) if (!strncmp(st, "show", 4)) navi_bar = 1; get_state(PART:"elm.swallow.content", st, 30, vl) @@ -326,19 +258,13 @@ // set navi bar if (navi_bar == 1) { - if (indicator == 1) { - set_state(PART:"elm.swallow.navi_bar", "show_with_indicator", 0.0) - } else { - set_state(PART:"elm.swallow.navi_bar", "show", 0.0) - } + set_state(PART:"elm.swallow.navi_bar", "show", 0.0) } // set content if (content == 1) { if (navi_bar == 1) { set_state(PART:"elm.swallow.content", "show_with_navi_bar", 0.0) - } else if (indicator == 1) { - set_state(PART:"elm.swallow.content", "show_with_indicator", 0.0) } else { set_state(PART:"elm.swallow.content", "show", 0.0) }