From 783daed2a6ffa01e215826bb6d7d2c41596a6d28 Mon Sep 17 00:00:00 2001 From: Juyeon Lee Date: Mon, 10 Jul 2017 18:06:15 +0900 Subject: [PATCH 01/16] zoom-easeout-mask: use proxy to apply map Change-Id: Ib7071744de4ac0492a0df671d01470baa7419263 --- data/group/zoom-easeout-mask.edc | 179 +++++++++++++++++---------------------- 1 file changed, 79 insertions(+), 100 deletions(-) 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 -- 2.7.4 From b0f3fd899fc3a8375ddc88177775eb37173fce31 Mon Sep 17 00:00:00 2001 From: Doyoun Kang Date: Mon, 10 Jul 2017 21:12:20 +0900 Subject: [PATCH 02/16] Packaging: update version to 0.2.5 Change-Id: I90f61c5b7fb64df3dd602543586c59a2c9f1ad48 --- packaging/e-mod-tizen-effect.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/e-mod-tizen-effect.spec b/packaging/e-mod-tizen-effect.spec index 2fccba5..2b82a6f 100644 --- a/packaging/e-mod-tizen-effect.spec +++ b/packaging/e-mod-tizen-effect.spec @@ -1,5 +1,5 @@ Name: e-mod-tizen-effect -Version: 0.2.4 +Version: 0.2.5 Release: 1 Summary: The effect module for the enlightenment URL: http://www.enlightenment.org -- 2.7.4 From 668b0f77a0c0560303af6337dc95e8e66a4e2a47 Mon Sep 17 00:00:00 2001 From: Juyeon Lee Date: Fri, 14 Jul 2017 14:01:33 +0900 Subject: [PATCH 03/16] effect: background-zoom-fade not to blend with below windows Change-Id: I86ffb2d4f901c0b5cff40dace0e90b661a7fea80 --- data/group/background-zoom-fade.edc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/data/group/background-zoom-fade.edc b/data/group/background-zoom-fade.edc index bd2b349..a91903a 100644 --- a/data/group/background-zoom-fade.edc +++ b/data/group/background-zoom-fade.edc @@ -21,6 +21,14 @@ group { name: "e/comp/effects/background-zoom-fade"; } } parts { + part { name: "bg"; + type: RECT; + description { state: "default" 0.0; + color: 0 0 0 255; + rel1.relative: 0 0; + rel2.relative: 1 1; + } + } part { name: "clipper"; type: RECT; mouse_events: 0; -- 2.7.4 From 27f290d3c6859d963d166b1b296bcaa8369bebcf Mon Sep 17 00:00:00 2001 From: Juyeon Lee Date: Fri, 21 Jul 2017 16:36:07 +0900 Subject: [PATCH 04/16] Packaging: update version to 0.2.6 Change-Id: I80aa23335a411d7da27e6beeab98b3336e55475f --- packaging/e-mod-tizen-effect.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/e-mod-tizen-effect.spec b/packaging/e-mod-tizen-effect.spec index 2b82a6f..ea4e7bf 100644 --- a/packaging/e-mod-tizen-effect.spec +++ b/packaging/e-mod-tizen-effect.spec @@ -1,5 +1,5 @@ Name: e-mod-tizen-effect -Version: 0.2.5 +Version: 0.2.6 Release: 1 Summary: The effect module for the enlightenment URL: http://www.enlightenment.org -- 2.7.4 From db80a16cecba5e9c3664e070d287a2fd79971581 Mon Sep 17 00:00:00 2001 From: Juyeon Lee Date: Thu, 3 Aug 2017 10:05:18 +0900 Subject: [PATCH 05/16] e_mod_effect: svace fix Change-Id: I8cd3c00e7b75ee68efcbcb14cf7c9b05426a84b3 --- src/e_mod_effect.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/e_mod_effect.c b/src/e_mod_effect.c index 5b6f5cd..4d830d9 100644 --- a/src/e_mod_effect.c +++ b/src/e_mod_effect.c @@ -89,6 +89,7 @@ _eff_object_underlayer_get(E_Client *ec) if (zpos >= primary_zpos) continue; ulayer = E_NEW(Under_Layer, 1); + if (!ulayer) continue; ulayer->zpos = zpos; ulayer->tlayer = layer; @@ -247,6 +248,7 @@ _eff_client_new(E_Client *ec) E_Effect_Client *efc; efc = E_NEW(E_Effect_Client, 1); + if (!efc) return NULL; efc->ec = ec; efc->animating = 0; efc->delay_del_ref = 0; -- 2.7.4 From 577fbd68e884893bd14ce68e058ee1bd2b6842c0 Mon Sep 17 00:00:00 2001 From: Juyeon Lee Date: Tue, 25 Jul 2017 11:37:39 +0900 Subject: [PATCH 06/16] background_effect: make bottom most one to be opaque Change-Id: I957f04fc34b7c3af4e483797090a8aa33e2679c8 --- data/group/background-zoom-fade.edc | 12 ++++++++++++ src/e_mod_effect.c | 25 +++++++++++++++++++------ 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/data/group/background-zoom-fade.edc b/data/group/background-zoom-fade.edc index a91903a..c08df5e 100644 --- a/data/group/background-zoom-fade.edc +++ b/data/group/background-zoom-fade.edc @@ -4,7 +4,9 @@ group { name: "e/comp/effects/background-zoom-fade"; if ((type == MSG_INT_SET) && (id == 0)) { /*set state */ new st; + new bg; st = getarg(2); + bg = getarg(3); if (st == 0) { set_state(PART:"e.swallow.content", "zoom-in", 0.0); @@ -15,6 +17,11 @@ group { name: "e/comp/effects/background-zoom-fade"; set_state(PART:"e.swallow.content", "zoom-out", 0.0); set_state(PART:"clipper", "zoom-out", 0.0); } + + if (bg) + { + set_state(PART:"bg", "opaque", 0.0); + } } else if ((type == MSG_INT_SET) && (id == 1)) { } @@ -24,6 +31,11 @@ group { name: "e/comp/effects/background-zoom-fade"; part { name: "bg"; type: RECT; description { state: "default" 0.0; + color: 0 0 0 0; + rel1.relative: 0 0; + rel2.relative: 1 1; + } + description { state: "opaque" 0.0; color: 0 0 0 255; rel1.relative: 0 0; rel2.relative: 1 1; diff --git a/src/e_mod_effect.c b/src/e_mod_effect.c index 4d830d9..4d350df 100644 --- a/src/e_mod_effect.c +++ b/src/e_mod_effect.c @@ -534,7 +534,7 @@ _eff_object_background_cb_zoom_out_done(void *data, Evas_Object *obj, const char } static void -_eff_object_background_start(E_Client *bg_ec, E_Effect_Type type) +_eff_object_background_start(E_Client *bg_ec, E_Effect_Type type, int bg_opaque) { E_Effect_Client *bg_efc = NULL; @@ -548,6 +548,8 @@ _eff_object_background_start(E_Client *bg_ec, E_Effect_Type type) ((bg_efc->animating) && !((bg_ec->launching) && (bg_efc->animating == 1)))) return; + // 1st param : zoom-in(0) zoom-out(1) + // 2nd param : background rect transparency(0) opaque(1) switch (type) { case E_EFFECT_TYPE_SHOW: @@ -556,7 +558,7 @@ _eff_object_background_start(E_Client *bg_ec, E_Effect_Type type) { e_object_ref(E_OBJECT(bg_ec)); _eff_object_setup(bg_ec, E_EFFECT_GROUP_BACKGROUND); - e_comp_object_effect_params_set(bg_ec->frame, 0, (int[]){0}, 1); + e_comp_object_effect_params_set(bg_ec->frame, 0, (int[]){0, bg_opaque}, 2); e_comp_object_effect_start(bg_ec->frame, _eff_object_background_cb_zoom_in_done, bg_ec); bg_efc->bg_animating = 1; } @@ -565,7 +567,7 @@ _eff_object_background_start(E_Client *bg_ec, E_Effect_Type type) case E_EFFECT_TYPE_RESTACK_HIDE: e_object_ref(E_OBJECT(bg_ec)); _eff_object_setup(bg_ec, E_EFFECT_GROUP_BACKGROUND); - e_comp_object_effect_params_set(bg_ec->frame, 0, (int[]){1}, 1); + e_comp_object_effect_params_set(bg_ec->frame, 0, (int[]){1, bg_opaque}, 2); e_comp_object_effect_start(bg_ec->frame, _eff_object_background_cb_zoom_out_done, bg_ec); bg_efc->bg_animating = 1; break; @@ -575,7 +577,7 @@ _eff_object_background_start(E_Client *bg_ec, E_Effect_Type type) { e_object_ref(E_OBJECT(bg_ec)); _eff_object_setup(bg_ec, E_EFFECT_GROUP_BACKGROUND); - e_comp_object_effect_params_set(bg_ec->frame, 0, (int[]){1}, 1); + e_comp_object_effect_params_set(bg_ec->frame, 0, (int[]){1, bg_opaque}, 2); e_comp_object_effect_start(bg_ec->frame, _eff_object_background_cb_zoom_out_done, bg_ec); bg_efc->bg_animating = 1; } @@ -603,15 +605,26 @@ _eff_object_background_setup(E_Client *ec, E_Client *home_ec, E_Effect_Group gro if ((ec->argb) || (ec->effect_type)) return; //need to check opaque? if (home_ec) - _eff_object_background_start(home_ec, type); + _eff_object_background_start(home_ec, type, 1); else { + int first = 1; + _eff_object_background_below_clients_get(ec, type, &bg_list); if (!bg_list) return; EINA_LIST_FREE(bg_list, bg_ec) { - _eff_object_background_start(bg_ec, type); + if (first) + { + EFFDBG("make bottom most background to be opaque", bg_ec->pixmap, bg_ec); + _eff_object_background_start(bg_ec, ec, type, 1); + first = 0; + } + else + { + _eff_object_background_start(bg_ec, ec, type, 0); + } } } } -- 2.7.4 From 59cae0e505c911c552be709dd3a7b99c0a89ada6 Mon Sep 17 00:00:00 2001 From: Juyeon Lee Date: Thu, 3 Aug 2017 14:48:19 +0900 Subject: [PATCH 07/16] zoom-easeout: change portion from 0.3 to 0.6 Change-Id: I2574472101e91f7277df4fe4e7c7911446c39725 --- data/group/zoom-easeout.edc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/group/zoom-easeout.edc b/data/group/zoom-easeout.edc index 0b43f84..0bc65b5 100644 --- a/data/group/zoom-easeout.edc +++ b/data/group/zoom-easeout.edc @@ -108,8 +108,8 @@ group { name: "e/comp/effects/zoom-easeout"; map { on: 1; smooth: 1; - zoom.x: 0.3; - zoom.y: 0.3; + zoom.x: 0.6; + zoom.y: 0.6; } } description { state: "visible" 0.0; @@ -151,8 +151,8 @@ group { name: "e/comp/effects/zoom-easeout"; map { on: 1; smooth: 1; - zoom.x: 0.3; - zoom.y: 0.3; + zoom.x: 0.6; + zoom.y: 0.6; } } description { state: "visible" 0.0; -- 2.7.4 From f8f6ff922db55cd64121d93d3ffa86aa0e91b215 Mon Sep 17 00:00:00 2001 From: Juyeon Lee Date: Thu, 3 Aug 2017 15:36:52 +0900 Subject: [PATCH 08/16] Packaging: update version to 0.2.7 Change-Id: I40fafa6debb7faff2d9fc485aee52ebf0bbdeeab --- packaging/e-mod-tizen-effect.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/e-mod-tizen-effect.spec b/packaging/e-mod-tizen-effect.spec index ea4e7bf..3684087 100644 --- a/packaging/e-mod-tizen-effect.spec +++ b/packaging/e-mod-tizen-effect.spec @@ -1,5 +1,5 @@ Name: e-mod-tizen-effect -Version: 0.2.6 +Version: 0.2.7 Release: 1 Summary: The effect module for the enlightenment URL: http://www.enlightenment.org -- 2.7.4 From 8d79c817569da575bb398dd98abc98126874ed5c Mon Sep 17 00:00:00 2001 From: Juyeon Lee Date: Fri, 4 Aug 2017 11:14:30 +0900 Subject: [PATCH 09/16] fix build break Change-Id: Iaff4eae197e81e637ce17c098a9df7cb228af410 --- src/e_mod_effect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/e_mod_effect.c b/src/e_mod_effect.c index 4d350df..423df78 100644 --- a/src/e_mod_effect.c +++ b/src/e_mod_effect.c @@ -618,12 +618,12 @@ _eff_object_background_setup(E_Client *ec, E_Client *home_ec, E_Effect_Group gro if (first) { EFFDBG("make bottom most background to be opaque", bg_ec->pixmap, bg_ec); - _eff_object_background_start(bg_ec, ec, type, 1); + _eff_object_background_start(bg_ec, type, 1); first = 0; } else { - _eff_object_background_start(bg_ec, ec, type, 0); + _eff_object_background_start(bg_ec, type, 0); } } } -- 2.7.4 From 1d8eaf0f7a0e9d37c1e9eea80e769f4c33a2e81d Mon Sep 17 00:00:00 2001 From: Doyoun Kang Date: Thu, 10 Aug 2017 11:21:11 +0900 Subject: [PATCH 10/16] add log for resetting ec's launching flag Change-Id: I5f2eb93ab2495585e379c49000432124606fd706 --- src/e_mod_effect.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/e_mod_effect.c b/src/e_mod_effect.c index 423df78..cfa6912 100644 --- a/src/e_mod_effect.c +++ b/src/e_mod_effect.c @@ -231,6 +231,7 @@ _eff_event_send(E_Client *ec, Eina_Bool start, E_Effect_Type type) ec->extra_animating = EINA_FALSE; if (ec->launching == EINA_TRUE) { + ELOGF("COMP", "Un-Set launching flag..", ec->pixmap, ec); ec->launching = EINA_FALSE; if (ec->first_mapped) { @@ -1301,6 +1302,7 @@ _eff_cb_restack_finish_done(void *data, Evas_Object *obj, const char *sig, const ec_home->extra_animating = EINA_FALSE; if (ec_home->launching == EINA_TRUE) { + ELOGF("COMP", "Un-Set launching flag..", ec_home->pixmap, ec_home); ec_home->launching = EINA_FALSE; if (ec_home->first_mapped) { -- 2.7.4 From 0dc29a0f23d3c99695fcdb6764fba1176cbaef4a Mon Sep 17 00:00:00 2001 From: Juyeon Lee Date: Thu, 10 Aug 2017 16:02:54 +0900 Subject: [PATCH 11/16] Packaging: update version to 0.2.8 Change-Id: Ie5b39687dbb348bb0773ae0d4ff1e90e1daaa1dc --- packaging/e-mod-tizen-effect.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/e-mod-tizen-effect.spec b/packaging/e-mod-tizen-effect.spec index 3684087..5b7e68c 100644 --- a/packaging/e-mod-tizen-effect.spec +++ b/packaging/e-mod-tizen-effect.spec @@ -1,5 +1,5 @@ Name: e-mod-tizen-effect -Version: 0.2.7 +Version: 0.2.8 Release: 1 Summary: The effect module for the enlightenment URL: http://www.enlightenment.org -- 2.7.4 From 54e47a4e920f7f619bf49f925f195647c3868100 Mon Sep 17 00:00:00 2001 From: Juyeon Lee Date: Wed, 16 Aug 2017 19:13:59 +0900 Subject: [PATCH 12/16] background-zoom-fade: change bg to default state at the end of effect Change-Id: Ic967d8feeb8cf9b0165eb180ab4030fe7e438103 --- data/group/background-zoom-fade.edc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/data/group/background-zoom-fade.edc b/data/group/background-zoom-fade.edc index c08df5e..73f1cc3 100644 --- a/data/group/background-zoom-fade.edc +++ b/data/group/background-zoom-fade.edc @@ -165,6 +165,11 @@ group { name: "e/comp/effects/background-zoom-fade"; after: "done"; } program { name: "done"; + action: STATE_SET "default" 0.0; + target: "bg"; + after: "done-emit"; + } + program { name: "done-emit"; action: SIGNAL_EMIT "e,action,done" "e"; } } -- 2.7.4 From 5ee9818468e05f793ad593ef034ddf4461cb2fc5 Mon Sep 17 00:00:00 2001 From: Juyeon Lee Date: Wed, 16 Aug 2017 19:24:17 +0900 Subject: [PATCH 13/16] Packaging: update version to 0.2.9 Change-Id: I756fbffa5fa3584567001f1a24708fa387364fe1 --- packaging/e-mod-tizen-effect.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/e-mod-tizen-effect.spec b/packaging/e-mod-tizen-effect.spec index 5b7e68c..c2a6ce9 100644 --- a/packaging/e-mod-tizen-effect.spec +++ b/packaging/e-mod-tizen-effect.spec @@ -1,5 +1,5 @@ Name: e-mod-tizen-effect -Version: 0.2.8 +Version: 0.2.9 Release: 1 Summary: The effect module for the enlightenment URL: http://www.enlightenment.org -- 2.7.4 From 64047fb9bec8405ca85976aba650e45e904cbb8d Mon Sep 17 00:00:00 2001 From: Juyeon Lee Date: Wed, 16 Aug 2017 20:10:13 +0900 Subject: [PATCH 14/16] keyboard edc:fix wrong rel2 on 180 degree Change-Id: Ica4cdaa0428dc9e4f0efd81278645c1c7e50b331 --- data/group/keyboard.edc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/group/keyboard.edc b/data/group/keyboard.edc index 2f02197..92d3641 100644 --- a/data/group/keyboard.edc +++ b/data/group/keyboard.edc @@ -110,7 +110,7 @@ group { name: "e/comp/effects/keyboard"; } description { state: "default,180" 0.0; rel1.relative: 0 -1; - rel2.relative: 0 1; + rel2.relative: 1 0; } description { state: "default,270" 0.0; rel1.relative: -1 0; -- 2.7.4 From 4dff54fd83a52033a6e6a7256b1e8ea97e919d04 Mon Sep 17 00:00:00 2001 From: Juyeon Lee Date: Thu, 31 Aug 2017 19:41:39 +0900 Subject: [PATCH 15/16] keyboard effect: ang params to refer screen rotation Change-Id: I5c1f945180b4373cbd603910d8f779f3c2591db7 --- src/e_mod_effect.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/e_mod_effect.c b/src/e_mod_effect.c index cfa6912..0f8fa31 100644 --- a/src/e_mod_effect.c +++ b/src/e_mod_effect.c @@ -313,8 +313,15 @@ _eff_group_angle_get(E_Client *ec, E_Effect_Group group) { if (group == E_EFFECT_GROUP_KEYBOARD) { - if (ec->parent) - return ec->parent->e.state.rot.ang.curr; + if (ec->parent) + { + int buffer_transform = e_comp_wl_output_buffer_transform_get(ec); + int rot = ec->parent->e.state.rot.ang.curr; + + rot = (rot + (buffer_transform * 90)) % 360; + + return rot; + } } return ec->e.state.rot.ang.curr; -- 2.7.4 From acb5f06acb8b04387eca0a33e83454794d2a4654 Mon Sep 17 00:00:00 2001 From: Juyeon Lee Date: Tue, 5 Sep 2017 21:10:05 +0900 Subject: [PATCH 16/16] add keyboard-easeout style and use configed value Change-Id: I3266114d0983774b1ed6cab140cc59af56757798 --- data/effect.edc | 5 + data/group/keyboard-easeout.edc | 238 ++++++++++++++++++++++++++++++++++++++++ src/e_mod_effect.c | 2 +- 3 files changed, 244 insertions(+), 1 deletion(-) create mode 100644 data/group/keyboard-easeout.edc diff --git a/data/effect.edc b/data/effect.edc index c050f9b..f1b8c37 100644 --- a/data/effect.edc +++ b/data/effect.edc @@ -34,6 +34,11 @@ collections { #include "group/keyboard.edc" /*-----------------------------------------------------*/ + /* group "e/comp/effects/keyboard-easeout" */ + /*-----------------------------------------------------*/ + #include "group/keyboard-easeout.edc" + + /*-----------------------------------------------------*/ /* group "e/comp/effects/background-zoom" */ /*-----------------------------------------------------*/ #include "group/background-zoom.edc" diff --git a/data/group/keyboard-easeout.edc b/data/group/keyboard-easeout.edc new file mode 100644 index 0000000..a3d3881 --- /dev/null +++ b/data/group/keyboard-easeout.edc @@ -0,0 +1,238 @@ +#define KEYBOARD_EFFECT_DURATION 0.35 +group { name: "e/comp/effects/keyboard-easeout"; + script { + public ang; + public message(Msg_Type:type, id, ...) { + if ((type == MSG_INT_SET) && (id == 0)) { + /*set state */ + new st; + new rot; + new buf[32]; + + st = getarg(2); + rot = getarg(3); + + set_int(ang, rot); + + if (st == 0) + { + snprintf(buf, sizeof(buf), "default,%d", rot); + set_state(PART:"clipper", "default", 0.0); + set_state(PART:"shower", buf, 0.0); + } + else if (st == 1) + { + set_state(PART:"clipper", "visible", 0.0); + set_state(PART:"shower", "visible", 0.0); + } + else if (st == 2) + { + snprintf(buf, sizeof(buf), "restack_hidden,%d", rot); + set_state(PART:"clipper", "restack_hidden", 0.0); + set_state(PART:"shower", buf, 0.0); + } + else if (st == 3) + { + set_state(PART:"clipper", "restack_visible", 0.0); + set_state(PART:"shower", "restack_visible", 0.0); + } + else if (st == 4) + { + set_state(PART:"clipper", "restack_done", 0.0); + set_state(PART:"shower", "restack_done", 0.0); + } + } else if ((type == MSG_INT_SET) && (id == 1)) + { + } + } + public hide_state(val, Float:pos) + { + new rot; + new buf[32]; + + rot = get_int(ang); + snprintf(buf, sizeof(buf), "hide,%d", rot); + + set_tween_state_anim(PART:"shower", "visible", 0.0, buf, 0.0, CUBIC_BEZIER, pos, 0.25, 0.46, 0.45, 1.0); + set_tween_state_anim(PART:"clipper", "visible", 0.0, buf, 0.0, CUBIC_BEZIER, pos, 0.25, 0.46, 0.45, 1.0); + + if (pos == 1.0) + { + if (get_int(val) == 1) + run_program(PROGRAM:"hide2"); + else + run_program(PROGRAM:"done"); + } + } + } + parts { + part { name: "clipper"; + type: RECT; + mouse_events: 0; + description { state: "default" 0.0; + color: 255 255 255 255; + 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; + color: 255 255 255 255; + } + 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 1; + rel2.relative: 1 2; + } + description { state: "default,0" 0.0; + inherit: "default" 0.0; + } + description { state: "default,90" 0.0; + rel1.relative: 1 0; + rel2.relative: 2 1; + } + description { state: "default,180" 0.0; + rel1.relative: 0 -1; + rel2.relative: 1 0; + } + description { state: "default,270" 0.0; + rel1.relative: -1 0; + rel2.relative: 0 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: "hide,0" 0.0; + inherit: "hide" 0.0; + } + description { state: "hide,90" 0.0; + inherit: "default,90" 0.0; + } + description { state: "hide,180" 0.0; + inherit: "default,180" 0.0; + } + description { state: "hide,270" 0.0; + inherit: "default,270" 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_hidden,0" 0.0; + inherit: "restack_hidden" 0.0; + } + description { state: "restack_hidden,90" 0.0; + inherit: "default,90" 0.0; + } + description { state: "restack_hidden,180" 0.0; + inherit: "default,180" 0.0; + } + description { state: "restack_hidden,270" 0.0; + inherit: "default,270" 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"; + } + description { state: "visible" 0.0; + rel1.to: "shower"; + rel2.to: "shower"; + } + description { state: "hide" 0.0; + rel1.to: "shower"; + rel2.to: "shower"; + } + } + } + programs { + program { name: "show1"; + signal: "e,action,go"; + source: "e"; + filter: "clipper" "default"; + action: STATE_SET "visible" 0.0; + transition: CUBIC_BEZIER KEYBOARD_EFFECT_DURATION 0.25 0.46 0.45 1.0; + target: "shower"; + target: "clipper"; + target: "e.swallow.content"; + after: "done"; + } + program { name: "hide1"; + signal: "e,action,go"; + source: "e"; + filter: "clipper" "visible"; + script{ + anim(KEYBOARD_EFFECT_DURATION, "hide_state", 1); + } + } + program { name: "hide2"; + action: STATE_SET "default" 0.0; + target: "shower"; + target: "clipper"; + after: "done"; + } + program { name: "restack,hide"; + signal: "e,action,go"; + source: "e"; + filter: "clipper" "restack_visible"; + script{ + anim(KEYBOARD_EFFECT_DURATION, "hide_state", 0); + } + } + program { name: "restack,show"; + signal: "e,action,go"; + source: "e"; + filter: "clipper" "restack_hidden"; + action: STATE_SET "visible" 0.0; + transition: CUBIC_BEZIER KEYBOARD_EFFECT_DURATION 0.25 0.46 0.45 1.0; + target: "shower"; + target: "clipper"; + target: "e.swallow.content"; + after: "done"; + } + program { name: "restack,finish"; + signal: "e,action,go"; + source: "e"; + filter: "clipper" "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 0f8fa31..5e6fd99 100644 --- a/src/e_mod_effect.c +++ b/src/e_mod_effect.c @@ -336,7 +336,7 @@ _eff_object_setup(E_Client *ec, E_Effect_Group group) if (!ec) return; if (group == E_EFFECT_GROUP_KEYBOARD) - e_comp_object_effect_set(ec->frame, "keyboard"); + e_comp_object_effect_set(ec->frame, cfg->kbd_effect_style); else if (group == E_EFFECT_GROUP_BACKGROUND) e_comp_object_effect_set(ec->frame, cfg->bg_effect_style); else -- 2.7.4