enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

enforce wayland subsurface stacking order when parent surface is restacked

This commit is contained in:
Mike Blumenkrantz 2015-12-10 10:30:57 -05:00
parent 903099c021
commit 1b240c5b63
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/bin/e_comp_wl.c
View File

@ -551,6 +551,25 @@ _e_comp_wl_evas_cb_focus_out(void *data, Evas *evas EINA_UNUSED, Evas_Object *ob
}
static void
_e_comp_wl_evas_cb_restack(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
E_Client *sec, *ec = data;
Eina_List *l, *ll;
if (!ec->comp_data->sub.list) return;
EINA_LIST_FOREACH(ec->comp_data->sub.list, l, sec)
evas_object_layer_set(sec->frame, evas_object_layer_get(ec->frame));
sec = eina_list_last_data_get(ec->comp_data->sub.list);
evas_object_stack_above(sec->frame, ec->frame);
EINA_LIST_REVERSE_FOREACH_SAFE(ec->comp_data->sub.list, l, ll, sec)
{
E_Client *nsec = eina_list_data_get(ll);
if (nsec)
evas_object_stack_below(nsec->frame, sec->frame);
}
}
_e_comp_wl_evas_cb_resize(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED)
{
E_Client *ec;
@ -782,6 +801,9 @@ _e_comp_wl_client_evas_init(E_Client *ec)
evas_object_smart_callback_add(ec->frame, "unfullscreen",
_e_comp_wl_evas_cb_state_update, ec);
}
evas_object_event_callback_priority_add(ec->frame, EVAS_CALLBACK_RESTACK,
EVAS_CALLBACK_PRIORITY_AFTER,
_e_comp_wl_evas_cb_restack, ec);
/* setup delete/kill callbacks */
evas_object_smart_callback_add(ec->frame, "delete_request",
@ -1916,6 +1938,7 @@ _e_comp_wl_subsurface_create(E_Client *ec, E_Client *epc, uint32_t id, struct wl
ec->netwm.state.skip_pager = EINA_TRUE;
ec->no_shape_cut = EINA_TRUE;
ec->border_size = 0;
ec->layer_block = 1;
if (epc)
{