From 8d79c817569da575bb398dd98abc98126874ed5c Mon Sep 17 00:00:00 2001 From: Juyeon Lee Date: Fri, 4 Aug 2017 11:14:30 +0900 Subject: [PATCH 01/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 02/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 03/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 04/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 05/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 06/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 07/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 08/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 From 97911358cfe643e2b8dc3633ca233c807c3572fa Mon Sep 17 00:00:00 2001 From: Juyeon Lee Date: Tue, 5 Sep 2017 21:15:25 +0900 Subject: [PATCH 09/16] Packaging: update version to 0.2.10 Change-Id: I66b752a53a36226ba09874e680e4f526ab7f2840 --- 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 c2a6ce9..232ea47 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.9 +Version: 0.2.10 Release: 1 Summary: The effect module for the enlightenment URL: http://www.enlightenment.org -- 2.7.4 From b33e79741e1eeac87ef8f4ec448543ffd3eb0396 Mon Sep 17 00:00:00 2001 From: Juyeon Lee Date: Wed, 20 Sep 2017 13:23:35 +0900 Subject: [PATCH 10/16] background-zoom-fade: have rotation angle as 2nd param Change-Id: I209654ef2e50029e88ee03131dab020cfb63736a --- data/group/background-zoom-fade.edc | 3 ++- src/e_mod_effect.c | 13 +++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/data/group/background-zoom-fade.edc b/data/group/background-zoom-fade.edc index 73f1cc3..4833783 100644 --- a/data/group/background-zoom-fade.edc +++ b/data/group/background-zoom-fade.edc @@ -6,7 +6,8 @@ group { name: "e/comp/effects/background-zoom-fade"; new st; new bg; st = getarg(2); - bg = getarg(3); + // new rot = getarg(3); + bg = getarg(4); if (st == 0) { set_state(PART:"e.swallow.content", "zoom-in", 0.0); diff --git a/src/e_mod_effect.c b/src/e_mod_effect.c index 5e6fd99..2b1f8c1 100644 --- a/src/e_mod_effect.c +++ b/src/e_mod_effect.c @@ -545,6 +545,7 @@ static void _eff_object_background_start(E_Client *bg_ec, E_Effect_Type type, int bg_opaque) { E_Effect_Client *bg_efc = NULL; + int ang = -1; if (!bg_ec) return; if (e_object_is_del(E_OBJECT(bg_ec))) return; @@ -557,7 +558,8 @@ _eff_object_background_start(E_Client *bg_ec, E_Effect_Type type, int bg_opaque) return; // 1st param : zoom-in(0) zoom-out(1) - // 2nd param : background rect transparency(0) opaque(1) + // 2nd param : rotation angle + // 3rd param : background rect transparency(0) opaque(1) switch (type) { case E_EFFECT_TYPE_SHOW: @@ -566,7 +568,8 @@ _eff_object_background_start(E_Client *bg_ec, E_Effect_Type type, int bg_opaque) { 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, bg_opaque}, 2); + ang = _eff_group_angle_get(bg_ec, E_EFFECT_GROUP_BACKGROUND); + e_comp_object_effect_params_set(bg_ec->frame, 0, (int[]){0, ang, bg_opaque}, 3); e_comp_object_effect_start(bg_ec->frame, _eff_object_background_cb_zoom_in_done, bg_ec); bg_efc->bg_animating = 1; } @@ -575,7 +578,8 @@ _eff_object_background_start(E_Client *bg_ec, E_Effect_Type type, int bg_opaque) 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, bg_opaque}, 2); + ang = _eff_group_angle_get(bg_ec, E_EFFECT_GROUP_BACKGROUND); + e_comp_object_effect_params_set(bg_ec->frame, 0, (int[]){1, ang, bg_opaque}, 3); e_comp_object_effect_start(bg_ec->frame, _eff_object_background_cb_zoom_out_done, bg_ec); bg_efc->bg_animating = 1; break; @@ -585,7 +589,8 @@ _eff_object_background_start(E_Client *bg_ec, E_Effect_Type type, int bg_opaque) { 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, bg_opaque}, 2); + ang = _eff_group_angle_get(bg_ec, E_EFFECT_GROUP_BACKGROUND); + e_comp_object_effect_params_set(bg_ec->frame, 0, (int[]){1, ang, bg_opaque}, 3); e_comp_object_effect_start(bg_ec->frame, _eff_object_background_cb_zoom_out_done, bg_ec); bg_efc->bg_animating = 1; } -- 2.7.4 From 7bf807bfd4b42f7e10840edfe39a84b81f5b58f1 Mon Sep 17 00:00:00 2001 From: Juyeon Lee Date: Wed, 20 Sep 2017 13:26:22 +0900 Subject: [PATCH 11/16] Packaging: update version to 0.2.11 Change-Id: Iaca2d8bbc5b9dbfe2b735590f3ac2ba7532f907a --- 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 232ea47..75a0b92 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.10 +Version: 0.2.11 Release: 1 Summary: The effect module for the enlightenment URL: http://www.enlightenment.org -- 2.7.4 From 60d382cfa39cdaf380f312b6dfdc686e15ac9685 Mon Sep 17 00:00:00 2001 From: JengHyun Kang Date: Thu, 28 Sep 2017 17:11:14 +0900 Subject: [PATCH 12/16] fix a memory leak in init function Change-Id: Ie56d291a3f3943eb3ac9743d9ab9f3791efc0f7f --- src/e_mod_effect.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/e_mod_effect.c b/src/e_mod_effect.c index 2b1f8c1..80f7880 100644 --- a/src/e_mod_effect.c +++ b/src/e_mod_effect.c @@ -1725,6 +1725,8 @@ e_mod_effect_init(void) eff = E_NEW(E_Effect, 1); EINA_SAFETY_ON_NULL_RETURN_VAL(eff, EINA_FALSE); + _eff = eff; + if ((cfg = e_comp_config_get())) { eff->file = eina_stringshare_add(cfg->effect_file); @@ -1776,8 +1778,6 @@ e_mod_effect_init(void) E_COMP_OBJ_EFF_MOVER_APPEND(eff->providers, 100, "e,action,restack*", _eff_cb_restack, eff); E_COMP_OBJ_EFF_MOVER_APPEND(eff->providers, 100, "e,action,launch,done", _eff_cb_launch, eff); - _eff = eff; - return EINA_TRUE; err: @@ -1804,5 +1804,11 @@ e_mod_effect_shutdown() E_FREE_FUNC(_eff->resources, eina_hash_free); E_FREE_FUNC(_eff->clients, eina_hash_free); + if (e_comp_config_get()) + { + eina_stringshare_del(_eff->file); + eina_stringshare_del(_eff->style); + } + E_FREE(_eff); } -- 2.7.4 From 5c1beea77d63e7e385b2d23d0135f7f9c8a257dd Mon Sep 17 00:00:00 2001 From: Juyeon Lee Date: Thu, 28 Sep 2017 17:25:45 +0900 Subject: [PATCH 13/16] Packaging: update version to 0.2.12 Change-Id: I20a68b5223545de14be815c4d90aee05e7d4a1b1 --- 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 75a0b92..e402907 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.11 +Version: 0.2.12 Release: 1 Summary: The effect module for the enlightenment URL: http://www.enlightenment.org -- 2.7.4 From 85a872d8d667a4bf0b7dc6f5b6a881d2be648361 Mon Sep 17 00:00:00 2001 From: Juyeon Lee Date: Tue, 10 Oct 2017 11:40:11 +0900 Subject: [PATCH 14/16] check return value Change-Id: I3487ee19f056b5f5dabf280a8feb0b9a206b4e09 --- src/e_mod_effect.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/e_mod_effect.c b/src/e_mod_effect.c index 80f7880..6b1bae6 100644 --- a/src/e_mod_effect.c +++ b/src/e_mod_effect.c @@ -116,17 +116,19 @@ _eff_object_underlayer_get(E_Client *ec) tbm_surface_h buffer; Evas_Native_Surface ns; tdm_info_layer info; + tdm_error err = TDM_ERROR_NONE; layer = ulayer->tlayer; buffer = tdm_layer_get_displaying_buffer(layer, NULL); if (!buffer) continue; + err = tdm_layer_get_info(layer, &info); + if (err != TDM_ERROR_NONE) return NULL; + img = evas_object_image_filled_add(e_comp->evas); if (!img) continue; - tdm_layer_get_info(layer, &info); - if (info.dst_pos.w <= 0 || info.dst_pos.h <= 0) memset(&ns, 0, sizeof(Evas_Native_Surface)); -- 2.7.4 From 76ae3a693c648744d3173702abc00e62cc82a9b2 Mon Sep 17 00:00:00 2001 From: Juyeon Lee Date: Tue, 10 Oct 2017 20:54:51 +0900 Subject: [PATCH 15/16] e_mod_effect: add skip condition to get background client list Change-Id: Ibc1b4c0463b4686f18ba776cbedabeed52dcda9b --- src/e_mod_effect.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/e_mod_effect.c b/src/e_mod_effect.c index 6b1bae6..b70982b 100644 --- a/src/e_mod_effect.c +++ b/src/e_mod_effect.c @@ -496,6 +496,11 @@ _eff_object_background_below_clients_get(E_Client *ec, E_Effect_Type type, Eina_ return; } + if (e_object_is_del(E_OBJECT(below))) continue; + if (ec->zone != below->zone) continue; + if (e_client_util_ignored_get(below) || + (!evas_object_visible_get(below->frame))) continue; + if (below->vkbd.vkbd) continue; -- 2.7.4 From 063db43319f3863ebe1f8b5e986e8e40a64cafc5 Mon Sep 17 00:00:00 2001 From: Juyeon Lee Date: Tue, 10 Oct 2017 21:17:21 +0900 Subject: [PATCH 16/16] e_mod_effect: underlayer skip condition changed Change-Id: I909d3bac334288e79e957f1488647e67c2e0c958 --- src/e_mod_effect.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/e_mod_effect.c b/src/e_mod_effect.c index b70982b..566376d 100644 --- a/src/e_mod_effect.c +++ b/src/e_mod_effect.c @@ -124,13 +124,14 @@ _eff_object_underlayer_get(E_Client *ec) if (!buffer) continue; err = tdm_layer_get_info(layer, &info); - if (err != TDM_ERROR_NONE) return NULL; + if (err != TDM_ERROR_NONE) continue; + + if (info.dst_pos.w <= 0 || info.dst_pos.h <= 0) + continue; img = evas_object_image_filled_add(e_comp->evas); if (!img) continue; - if (info.dst_pos.w <= 0 || info.dst_pos.h <= 0) - memset(&ns, 0, sizeof(Evas_Native_Surface)); ns.version = EVAS_NATIVE_SURFACE_VERSION; ns.type = EVAS_NATIVE_SURFACE_TBM; -- 2.7.4