From: parksanghee Date: Mon, 13 Feb 2017 07:20:57 +0000 (+0900) Subject: Implement depth-in effect X-Git-Tag: submit/tizen/20170215.124049~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d80cc0c98899a162bd9ed6aeceaa927f39382994;p=platform%2Fcore%2Fuifw%2Fe-mod-tizen-effect.git Implement depth-in effect [Model] Tizen3.0 [BinType] AP [Customer] N/A [Issue#] N/A [Request] Support depth-in [Occurrence Version] N/A [Problem] Not support dpeth-in concept [Cause & Measure] There is no interface to support concept [Checking Method] Setting > Wifi [Team] Window Manager [Developer] Sanghee Park [Solution company] Samsung [Change Type] New feature Change-Id: I5448f435684c4d306d5321637f1767a8be28d2eb --- diff --git a/data/effect.edc b/data/effect.edc index 81ed67b..bd616bb 100644 --- a/data/effect.edc +++ b/data/effect.edc @@ -13,6 +13,11 @@ collections { /*-----------------------------------------------------*/ #include "group/fade.edc" + /*-----------------------------------------------------*/ + /* group "e/comp/effects/zoom" */ + /*-----------------------------------------------------*/ + #include "group/zoom.edc" + /*-----------------------------------------------------*/ /* group "e/comp/effects/keyboard" */ /*-----------------------------------------------------*/ diff --git a/data/group/fade.edc b/data/group/fade.edc index c68fda2..802ed60 100644 --- a/data/group/fade.edc +++ b/data/group/fade.edc @@ -100,29 +100,16 @@ group { name: "e/comp/effects/fade"; description { state: "default" 0.0; rel1.to: "shower"; rel2.to: "shower"; - map { - on: 1; - smooth: 1; - zoom.x: 0.9; - zoom.y: 0.9; - } } 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; @@ -144,7 +131,6 @@ group { name: "e/comp/effects/fade"; source: "e"; filter: "shower" "default"; action: STATE_SET "default" 0.0; - transition: LINEAR 0.01; target: "shower"; target: "clipper"; target: "e.swallow.content"; @@ -152,7 +138,7 @@ group { name: "e/comp/effects/fade"; } program { name: "show2"; action: STATE_SET "visible" 0.0; - transition: DECEL_FAC 0.10 0.8; + transition: CUBIC_BEZIER 0.15 0.25 0.46 0.45 1.0; target: "shower"; target: "clipper"; target: "e.swallow.content"; @@ -168,7 +154,6 @@ group { name: "e/comp/effects/fade"; source: "e"; filter: "shower" "visible"; action: STATE_SET "visible" 0.0; - transition: LINEAR 0.01; target: "shower"; target: "clipper"; target: "e.swallow.content"; @@ -176,7 +161,7 @@ group { name: "e/comp/effects/fade"; } program { name: "hide2"; action: STATE_SET "hide" 0.0; - transition: ACCEL_FAC 0.20 1.5; + transition: CUBIC_BEZIER 0.15 0.25 0.46 0.45 1.0; target: "shower"; target: "clipper"; target: "e.swallow.content"; @@ -194,7 +179,6 @@ group { name: "e/comp/effects/fade"; source: "e"; filter: "shower" "restack_hidden"; action: STATE_SET "restack_hidden" 0.0; - transition: LINEAR 0.01; target: "shower"; target: "clipper"; target: "e.swallow.content"; @@ -202,7 +186,7 @@ group { name: "e/comp/effects/fade"; } program { name: "restack,show2"; action: STATE_SET "visible" 0.0; - transition: DECEL_FAC 0.10 0.8; + transition: CUBIC_BEZIER 0.15 0.25 0.46 0.45 1.0; target: "shower"; target: "clipper"; target: "e.swallow.content"; @@ -218,7 +202,6 @@ group { name: "e/comp/effects/fade"; source: "e"; filter: "shower" "restack_visible"; action: STATE_SET "restack_visible" 0.0; - transition: LINEAR 0.01; target: "shower"; target: "clipper"; target: "e.swallow.content"; @@ -226,7 +209,7 @@ group { name: "e/comp/effects/fade"; } program { name: "restack,hide2"; action: STATE_SET "hide" 0.0; - transition: ACCEL_FAC 0.20 1.5; + transition: CUBIC_BEZIER 0.15 0.25 0.46 0.45 1.0; target: "shower"; target: "clipper"; target: "e.swallow.content"; diff --git a/data/group/zoom.edc b/data/group/zoom.edc new file mode 100644 index 0000000..e82b0a8 --- /dev/null +++ b/data/group/zoom.edc @@ -0,0 +1,249 @@ +group { name: "e/comp/effects/zoom"; + script { + public message(Msg_Type:type, id, ...) { + if ((type == MSG_INT_SET) && (id == 0)) { + /*set state */ + new st; + 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); + } + 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); + } + 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); + } + 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); + } + 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); + } + } else if ((type == MSG_INT_SET) && (id == 1)) + { + } + } + } + parts { + part { name: "clipper"; + type: RECT; + mouse_events: 0; + description { state: "default" 0.0; + color: 255 255 255 0; + rel1.relative: -1.0 -1.0; + rel1.offset: -9999 -9999; + rel2.relative: 2.0 2.0; + rel2.offset: 9999 9999; + visible: 1; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } + 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: "shower"; + type: SPACER; + description { state: "default" 0.0; + rel1.relative: 0 0; + rel2.relative: 1 1; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + rel1.relative: 0 0; + rel1.offset: 0 0; + rel2.relative: 1 1; + } + 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: "e.swallow.content"; type: SWALLOW; + type: SWALLOW; + clip_to: "clipper"; + description { state: "default" 0.0; + rel1.to: "shower"; + rel2.to: "shower"; + map { + on: 1; + smooth: 1; + zoom.x: 0.9; + zoom.y: 0.9; + } + } + 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; + } + } + } + programs { + program { name: "show1"; + signal: "e,action,go"; + source: "e"; + filter: "shower" "default"; + action: STATE_SET "default" 0.0; + transition: LINEAR 0.01; + target: "shower"; + target: "clipper"; + target: "e.swallow.content"; + after: "show2"; + } + program { name: "show2"; + action: STATE_SET "visible" 0.0; + transition: DECEL_FAC 0.10 0.8; + target: "shower"; + target: "clipper"; + target: "e.swallow.content"; + after: "show3"; + } + program { name: "show3"; + action: STATE_SET "visible_default" 0.0; + target: "e.swallow.content"; + after: "done"; + } + program { name: "hide1"; + signal: "e,action,go"; + source: "e"; + filter: "shower" "visible"; + action: STATE_SET "visible" 0.0; + transition: LINEAR 0.01; + target: "shower"; + target: "clipper"; + target: "e.swallow.content"; + after: "hide2"; + } + program { name: "hide2"; + action: STATE_SET "hide" 0.0; + transition: ACCEL_FAC 0.20 1.5; + target: "shower"; + target: "clipper"; + target: "e.swallow.content"; + after: "hide3"; + } + program { name: "hide3"; + action: STATE_SET "default" 0.0; + target: "shower"; + target: "clipper"; + target: "e.swallow.content"; + after: "done"; + } + program { name: "restack,show1"; + signal: "e,action,go"; + source: "e"; + filter: "shower" "restack_hidden"; + action: STATE_SET "restack_hidden" 0.0; + transition: LINEAR 0.01; + target: "shower"; + target: "clipper"; + target: "e.swallow.content"; + after: "restack,show2"; + } + program { name: "restack,show2"; + action: STATE_SET "visible" 0.0; + transition: DECEL_FAC 0.10 0.8; + target: "shower"; + target: "clipper"; + target: "e.swallow.content"; + after: "restack,show3"; + } + program { name: "restack,show3"; + action: STATE_SET "visible_default" 0.0; + target: "e.swallow.content"; + after: "done"; + } + program { name: "restack,hide1"; + signal: "e,action,go"; + source: "e"; + filter: "shower" "restack_visible"; + action: STATE_SET "restack_visible" 0.0; + transition: LINEAR 0.01; + target: "shower"; + target: "clipper"; + target: "e.swallow.content"; + after: "restack,hide2"; + } + program { name: "restack,hide2"; + action: STATE_SET "hide" 0.0; + transition: ACCEL_FAC 0.20 1.5; + target: "shower"; + target: "clipper"; + target: "e.swallow.content"; + after: "done"; + } + program { name: "restack,finish"; + signal: "e,action,go"; + source: "e"; + filter: "shower" "restack_done"; + action: STATE_SET "visible" 0.0; + target: "shower"; + target: "clipper"; + target: "e.swallow.content"; + after: "done"; + } + program { name: "done"; + action: SIGNAL_EMIT "e,action,done" "e"; + } + } +} diff --git a/src/e_mod_effect.c b/src/e_mod_effect.c index ae58589..89ad4e9 100644 --- a/src/e_mod_effect.c +++ b/src/e_mod_effect.c @@ -243,7 +243,9 @@ _eff_object_setup(E_Client *ec, E_Effect_Group group) e_comp_object_effect_set(ec->frame, "keyboard"); else { - if ((cfg) && (cfg->effect_style)) + if ((cfg) && (cfg->depth_in_style) && (ec->effect_type)) + e_comp_object_effect_set(ec->frame, cfg->depth_in_style); + else if ((cfg) && (cfg->effect_style)) e_comp_object_effect_set(ec->frame, cfg->effect_style); else e_comp_object_effect_set(ec->frame, "no-effect");