From 2d833b32f5f117208b16d93ec18bff8206acff20 Mon Sep 17 00:00:00 2001 From: Juyeon Lee Date: Fri, 6 Jan 2017 13:48:06 +0900 Subject: [PATCH] Revert "Revert "Do not set hidden when surface is destroied"" This reverts commit 1dcadf9d5b505c57155b374f0d854bae849e48d6. Change-Id: I1e6f54a9db1665222c88dd472d8a446a71c70cf8 --- src/bin/e_comp_object.c | 18 ------------------ src/bin/e_comp_wl.c | 2 +- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index b7203d4..abc8656 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -2555,24 +2555,6 @@ _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 f459d7d..aba1e45 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -2987,7 +2987,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 = ec->hidden = 1; + ec->dead = 1; /* check if internal animation is running */ if (e_comp_object_is_animating(ec->frame)) return; -- 2.7.4