From: Juyeon Lee Date: Mon, 10 Jul 2017 09:06:15 +0000 (+0900) Subject: zoom-easeout-mask: use proxy to apply map X-Git-Tag: submit/tizen/20170710.122732~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F23%2F137923%2F1;p=platform%2Fcore%2Fuifw%2Fe-mod-tizen-effect.git zoom-easeout-mask: use proxy to apply map Change-Id: Ib7071744de4ac0492a0df671d01470baa7419263 --- diff --git a/data/group/zoom-easeout-mask.edc b/data/group/zoom-easeout-mask.edc index cd9ec3a..1866dde 100644 --- a/data/group/zoom-easeout-mask.edc +++ b/data/group/zoom-easeout-mask.edc @@ -7,38 +7,33 @@ group { name: "e/comp/effects/zoom-easeout-mask"; st = getarg(2); if (st == 0) { - set_state(PART:"clipper", "default", 0.0); set_state(PART:"shower", "default", 0.0); - set_state(PART:"e.swallow.content", "default", 0.0); - set_state(PART:"under", "default", 0.0); + set_state(PART:"proxy1", "default", 0.0); + set_state(PART:"proxy2", "default", 0.0); } else if (st == 1) { - set_state(PART:"clipper", "visible", 0.0); set_state(PART:"shower", "visible", 0.0); - set_state(PART:"e.swallow.content", "visible", 0.0); - set_state(PART:"under", "visible", 0.0); + set_state(PART:"proxy1", "visible", 0.0); + set_state(PART:"proxy2", "visible", 0.0); } else if (st == 2) { - set_state(PART:"clipper", "restack_hidden", 0.0); set_state(PART:"shower", "restack_hidden", 0.0); - set_state(PART:"e.swallow.content", "restack_hidden", 0.0); - set_state(PART:"under", "restack_hidden", 0.0); + set_state(PART:"proxy1", "restack_hidden", 0.0); + set_state(PART:"proxy2", "restack_hidden", 0.0); } else if (st == 3) { - set_state(PART:"clipper", "restack_visible", 0.0); set_state(PART:"shower", "restack_visible", 0.0); - set_state(PART:"e.swallow.content", "restack_visible", 0.0); - set_state(PART:"under", "restack_visible", 0.0); + set_state(PART:"proxy1", "restack_visible", 0.0); + set_state(PART:"proxy2", "restack_visible", 0.0); } else if (st == 4) { - set_state(PART:"clipper", "restack_done", 0.0); set_state(PART:"shower", "restack_done", 0.0); - set_state(PART:"e.swallow.content", "restack_done", 0.0); - set_state(PART:"under", "restack_done", 0.0); + set_state(PART:"proxy1", "restack_done", 0.0); + set_state(PART:"proxy2", "restack_done", 0.0); } } else if ((type == MSG_INT_SET) && (id == 1)) { @@ -47,6 +42,16 @@ group { name: "e/comp/effects/zoom-easeout-mask"; } images.image: "circle_mask.png" COMP; parts { + part { name: circle_mask; + type: IMAGE; + scale: 1; + description { + state: "default" 0.0; + visible: 1; + fixed: 1 1; + image.normal: "circle_mask.png"; + } + } part { name: "shower"; type: SPACER; description { state: "default" 0.0; @@ -74,123 +79,106 @@ group { name: "e/comp/effects/zoom-easeout-mask"; } part { name: "e.swallow.content"; type: SWALLOW; type: SWALLOW; - clip_to: "clipper"; + clip_to: "circle_mask"; description { state: "default" 0.0; rel1.to: "shower"; rel2.to: "shower"; - map { - on: 1; - smooth: 1; - zoom.x: 0.6; - zoom.y: 0.6; - } - } - description { state: "visible" 0.0; - rel1.to: "shower"; - rel2.to: "shower"; - map { - on: 1; - smooth: 1; - zoom.x: 1; - zoom.y: 1; - } - } - description { state: "visible_default" 0.0; - rel1.to: "shower"; - rel2.to: "shower"; - rel1.relative: 0 0; - rel2.relative: 1 1; - map.on : 0; - } - description { state: "hide" 0.0; - inherit: "default" 0.0; - } - description { state: "restack_visible" 0.0; - inherit: "visible" 0.0; - } - description { state: "restack_hidden" 0.0; - inherit: "default" 0.0; - } - description { state: "restack_done" 0.0; - inherit: "visible" 0.0; } } part { name: "under"; type: SWALLOW; - clip_to: "clipper"; + clip_to: "circle_mask"; description { state: "default" 0.0; rel1.to: "shower"; rel2.to: "shower"; + } + } + part { name: "proxy1"; + type: PROXY; + description { state: "default" 0.0; + color: 255 255 255 0; + visible: 1; + source: "e.swallow.content"; + proxy.source_visible: 0; map { on: 1; smooth: 1; zoom.x: 0.6; zoom.y: 0.6; } + fixed: 1 1; } description { state: "visible" 0.0; - rel1.to: "shower"; - rel2.to: "shower"; - map { + inherit: "default" 0.0; + color: 255 255 255 255; + proxy.source_visible: 0; + map { on: 1; smooth: 1; zoom.x: 1; zoom.y: 1; - } + } } description { state: "visible_default" 0.0; - rel1.to: "shower"; - rel2.to: "shower"; - rel1.relative: 0 0; - rel2.relative: 1 1; + inherit: "visible" 0.0; + proxy.source_visible: 0; map.on : 0; } description { state: "hide" 0.0; inherit: "default" 0.0; + proxy.source_visible: 0; } description { state: "restack_visible" 0.0; inherit: "visible" 0.0; + proxy.source_visible: 0; } description { state: "restack_hidden" 0.0; inherit: "default" 0.0; + proxy.source_visible: 0; } description { state: "restack_done" 0.0; inherit: "visible" 0.0; + proxy.source_visible: 0; } } - part { name: "clipper"; - type: IMAGE; - mouse_events: 0; + part { name: "proxy2"; + type: PROXY; description { state: "default" 0.0; color: 255 255 255 0; - image.normal: "circle_mask.png"; visible: 1; + source: "under"; + proxy.source_visible: 0; map { on: 1; smooth: 1; zoom.x: 0.6; zoom.y: 0.6; } + fixed: 1 1; } description { state: "visible" 0.0; inherit: "default" 0.0; color: 255 255 255 255; + proxy.source_visible: 0; map { on: 1; smooth: 1; zoom.x: 1; zoom.y: 1; - } + } } description { state: "visible_default" 0.0; inherit: "visible" 0.0; + proxy.source_visible: 0; map.on : 0; } description { state: "hide" 0.0; inherit: "default" 0.0; + proxy.source_visible: 0; } description { state: "restack_visible" 0.0; inherit: "visible" 0.0; + proxy.source_visible: 0; } description { state: "restack_hidden" 0.0; inherit: "default" 0.0; @@ -207,24 +195,22 @@ group { name: "e/comp/effects/zoom-easeout-mask"; filter: "shower" "default"; action: STATE_SET "default" 0.0; target: "shower"; - target: "clipper"; - target: "e.swallow.content"; - target: "under"; + target: "proxy1"; + target: "proxy2"; after: "show2"; } program { name: "show2"; action: STATE_SET "visible" 0.0; transition: CUBIC_BEZIER 0.4 0.25 0.46 0.45 1.0; target: "shower"; - target: "clipper"; - target: "e.swallow.content"; - target: "under"; + target: "proxy1"; + target: "proxy2"; after: "show3"; } program { name: "show3"; action: STATE_SET "visible_default" 0.0; - target: "under"; - target: "e.swallow.content"; + target: "proxy1"; + target: "proxy2"; after: "done"; } program { name: "hide1"; @@ -233,26 +219,23 @@ group { name: "e/comp/effects/zoom-easeout-mask"; filter: "shower" "visible"; action: STATE_SET "visible" 0.0; target: "shower"; - target: "clipper"; - target: "e.swallow.content"; - target: "under"; + target: "proxy1"; + target: "proxy2"; after: "hide2"; } program { name: "hide2"; action: STATE_SET "hide" 0.0; transition: CUBIC_BEZIER 0.4 0.25 0.46 0.45 1.0; target: "shower"; - target: "clipper"; - target: "e.swallow.content"; - target: "under"; + target: "proxy1"; + target: "proxy2"; after: "hide3"; } program { name: "hide3"; action: STATE_SET "default" 0.0; target: "shower"; - target: "clipper"; - target: "e.swallow.content"; - target: "under"; + target: "proxy1"; + target: "proxy2"; after: "done"; } program { name: "restack,show1"; @@ -261,24 +244,23 @@ group { name: "e/comp/effects/zoom-easeout-mask"; filter: "shower" "restack_hidden"; action: STATE_SET "restack_hidden" 0.0; target: "shower"; - target: "clipper"; - target: "e.swallow.content"; - target: "under"; + target: "proxy1"; + target: "proxy2"; after: "restack,show2"; } program { name: "restack,show2"; action: STATE_SET "visible" 0.0; transition: CUBIC_BEZIER 0.4 0.25 0.46 0.45 1.0; target: "shower"; - target: "clipper"; - target: "e.swallow.content"; - target: "under"; + target: "proxy1"; + target: "proxy2"; after: "restack,show3"; } program { name: "restack,show3"; action: STATE_SET "visible_default" 0.0; - target: "e.swallow.content"; - target: "under"; + target: "shower"; + target: "proxy1"; + target: "proxy2"; after: "done"; } program { name: "restack,hide1"; @@ -287,18 +269,16 @@ group { name: "e/comp/effects/zoom-easeout-mask"; filter: "shower" "restack_visible"; action: STATE_SET "restack_visible" 0.0; target: "shower"; - target: "clipper"; - target: "e.swallow.content"; - target: "under"; + target: "proxy1"; + target: "proxy2"; after: "restack,hide2"; } program { name: "restack,hide2"; action: STATE_SET "hide" 0.0; transition: CUBIC_BEZIER 0.4 0.25 0.46 0.45 1.0; target: "shower"; - target: "clipper"; - target: "e.swallow.content"; - target: "under"; + target: "proxy1"; + target: "proxy2"; after: "done"; } program { name: "restack,finish"; @@ -307,13 +287,12 @@ group { name: "e/comp/effects/zoom-easeout-mask"; filter: "shower" "restack_done"; action: STATE_SET "visible" 0.0; target: "shower"; - target: "clipper"; - target: "e.swallow.content"; - target: "under"; + target: "proxy1"; + target: "proxy2"; after: "done"; } program { name: "done"; action: SIGNAL_EMIT "e,action,done" "e"; } } -} +} \ No newline at end of file