From: Juyeon Lee Date: Thu, 11 Jul 2019 09:59:26 +0000 (+0900) Subject: e_mod_effect: effect style unset if no effect start X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=97f99d504418d95b40343ec7f54ab4d2dcedd99b;p=platform%2Fcore%2Fuifw%2Fe-mod-tizen-effect.git e_mod_effect: effect style unset if no effect start in case of keyboard' magnifier window, it changes its stack between normal and normal above. while it changes its stack to normal, animation effect would run. but after running hide-effect and changing stack to above normal, its clipper color still remained in transparent. as a result, window would be shown transparent due to no edc run. Change-Id: I7f4a2b05d29788315f3875ef87912b5cd70e056b --- diff --git a/src/e_mod_effect.c b/src/e_mod_effect.c index 794be09..ccb34c6 100644 --- a/src/e_mod_effect.c +++ b/src/e_mod_effect.c @@ -943,7 +943,11 @@ _eff_cb_visible(void *data, Evas_Object *obj, const char *signal) group = _eff_group_get(ec); if ((group != E_EFFECT_GROUP_NORMAL) && - (group != E_EFFECT_GROUP_KEYBOARD)) return EINA_FALSE; + (group != E_EFFECT_GROUP_KEYBOARD)) + { + e_comp_object_effect_set(ec->frame, NULL); + return EINA_FALSE; + } if (evas_object_visible_get(obj)) return EINA_FALSE; if (!_eff_ref(ec)) return EINA_FALSE; @@ -1021,7 +1025,11 @@ _eff_cb_hidden(void *data, Evas_Object *obj, const char *signal) /* check for effect group */ group = _eff_group_get(ec); if ((group != E_EFFECT_GROUP_NORMAL) && - (group != E_EFFECT_GROUP_KEYBOARD)) return EINA_FALSE; + (group != E_EFFECT_GROUP_KEYBOARD)) + { + e_comp_object_effect_set(ec->frame, NULL); + return EINA_FALSE; + } if (group == E_EFFECT_GROUP_KEYBOARD) { @@ -1182,6 +1190,10 @@ _eff_cb_uniconify(void *data, Evas_Object *obj, const char *signal) e_comp_object_effect_start(ec->frame, _eff_cb_uniconify_done, ec); return EINA_TRUE; } + else + { + e_comp_object_effect_set(ec->frame, NULL); + } return EINA_FALSE; } @@ -1220,7 +1232,11 @@ _eff_cb_iconify(void *data, Evas_Object *obj, const char *signal) group = _eff_group_get(ec); if ((group != E_EFFECT_GROUP_NORMAL) && - (group != E_EFFECT_GROUP_KEYBOARD)) return EINA_FALSE; + (group != E_EFFECT_GROUP_KEYBOARD)) + { + e_comp_object_effect_set(ec->frame, NULL); + return EINA_FALSE; + } if (!evas_object_visible_get(obj)) return EINA_FALSE; @@ -1385,7 +1401,11 @@ _eff_cb_restack(void *data, Evas_Object *obj, const char *signal) } if ((group != E_EFFECT_GROUP_NORMAL) && - (group != E_EFFECT_GROUP_KEYBOARD)) return EINA_FALSE; + (group != E_EFFECT_GROUP_KEYBOARD)) + { + e_comp_object_effect_set(ec->frame, NULL); + return EINA_FALSE; + } if ((!e_util_strcmp(emission, "e,action,restack,show"))) {