forked from enlightenment/enlightenment
Re-enable window close animations for wayland
These should work properly with the new buffer management code.
This commit is contained in:
parent
36586fbf9c
commit
e4490c4bf6
|
@ -636,7 +636,6 @@ struct E_Client
|
||||||
unsigned int internal : 1;
|
unsigned int internal : 1;
|
||||||
unsigned int internal_no_remember : 1;
|
unsigned int internal_no_remember : 1;
|
||||||
unsigned int internal_no_reopen : 1;
|
unsigned int internal_no_reopen : 1;
|
||||||
Eina_Bool dead : 1;
|
|
||||||
|
|
||||||
Evas_Object *internal_elm_win;
|
Evas_Object *internal_elm_win;
|
||||||
|
|
||||||
|
|
|
@ -2187,20 +2187,6 @@ _e_comp_smart_hide(Evas_Object *obj)
|
||||||
evas_object_hide(cw->clip);
|
evas_object_hide(cw->clip);
|
||||||
if (cw->input_obj) evas_object_hide(cw->input_obj);
|
if (cw->input_obj) evas_object_hide(cw->input_obj);
|
||||||
evas_object_hide(cw->effect_obj);
|
evas_object_hide(cw->effect_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)) return;
|
|
||||||
}
|
|
||||||
if (stopping) return;
|
if (stopping) return;
|
||||||
if (!cw->ec->input_only)
|
if (!cw->ec->input_only)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1440,14 +1440,6 @@ static const struct wl_surface_interface _e_surface_interface =
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
static void
|
|
||||||
_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;
|
|
||||||
evas_object_hide(ec->frame);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_e_comp_wl_surface_destroy(struct wl_resource *resource)
|
_e_comp_wl_surface_destroy(struct wl_resource *resource)
|
||||||
|
@ -1456,7 +1448,7 @@ _e_comp_wl_surface_destroy(struct wl_resource *resource)
|
||||||
|
|
||||||
if (!(ec = wl_resource_get_user_data(resource))) return;
|
if (!(ec = wl_resource_get_user_data(resource))) return;
|
||||||
|
|
||||||
_e_comp_wl_surface_render_stop(ec);
|
evas_object_hide(ec->frame);
|
||||||
e_object_del(E_OBJECT(ec));
|
e_object_del(E_OBJECT(ec));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2167,7 +2159,7 @@ _e_comp_wl_client_cb_del(void *data EINA_UNUSED, E_Client *ec)
|
||||||
wl_resource_set_user_data(ec->comp_data->surface, NULL);
|
wl_resource_set_user_data(ec->comp_data->surface, NULL);
|
||||||
|
|
||||||
if (ec->internal_elm_win)
|
if (ec->internal_elm_win)
|
||||||
_e_comp_wl_surface_render_stop(ec);
|
evas_object_hide(ec->frame);
|
||||||
_e_comp_wl_focus_check();
|
_e_comp_wl_focus_check();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue