From: MinJeong Kim Date: Thu, 1 Dec 2016 09:02:46 +0000 (+0900) Subject: Revert "Do not set hidden when surface is destroied" X-Git-Tag: submit/tizen/20161201.124451~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1dcadf9d5b505c57155b374f0d854bae849e48d6;p=platform%2Fupstream%2Fenlightenment.git Revert "Do not set hidden when surface is destroied" This reverts commit 5d96e80d1606ccd630cd90ad48b292d1ed31b169. Change-Id: Iba3510ed9fe88d0de14cc468e3e0c55a6f52738a --- diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index 8f1fdbee59..494702d78f 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -2552,6 +2552,24 @@ _e_comp_smart_hide(Evas_Object *obj) evas_object_hide(cw->effect_obj); if (cw->transform_bg_obj) evas_object_hide(cw->transform_bg_obj); if (cw->transform_tranp_obj) evas_object_hide(cw->transform_tranp_obj); + if (cw->ec->dead) + { + Evas_Object *o; + + evas_object_hide(cw->obj); + EINA_LIST_FREE(cw->obj_mirror, o) + { + evas_object_image_data_set(o, NULL); + evas_object_freeze_events_set(o, 1); + evas_object_event_callback_del_full(o, EVAS_CALLBACK_DEL, _e_comp_object_cb_mirror_del, cw); + evas_object_del(o); + } + if (!_e_comp_object_animating_end(cw)) + { + TRACE_DS_END(); + return; + } + } if (stopping) { TRACE_DS_END(); diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index 8e532aef1c..7c4f8a4941 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -2945,7 +2945,7 @@ _e_comp_wl_surface_render_stop(E_Client *ec) { /* FIXME: this may be fine after e_pixmap can create textures for wl clients? */ //if ((!ec->internal) && (!e_comp_gl_get())) - ec->dead = 1; + ec->dead = ec->hidden = 1; /* check if internal animation is running */ if (e_comp_object_is_animating(ec->frame)) return;