avoid layer surface popups appearing below x{dg,wayland} clients

This commit is contained in:
Leonardo Hernández Hernández 2022-06-24 14:46:08 -05:00
parent 097b4a30f5
commit 549335ae54
Failed to generate hash of commit

7
dwl.c
View file

@ -952,9 +952,14 @@ createnotify(struct wl_listener *listener, void *data)
if (xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP) { if (xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP) {
struct wlr_box box; struct wlr_box box;
LayerSurface *l;
void *toplevel = toplevel_from_popup(xdg_surface->popup);
xdg_surface->surface->data = wlr_scene_xdg_surface_create( xdg_surface->surface->data = wlr_scene_xdg_surface_create(
xdg_surface->popup->parent->data, xdg_surface); xdg_surface->popup->parent->data, xdg_surface);
if (!(c = toplevel_from_popup(xdg_surface->popup)) || !c->mon) if (wlr_surface_is_layer_surface(xdg_surface->popup->parent) && (l = toplevel)
&& l->layer_surface->current.layer < ZWLR_LAYER_SHELL_V1_LAYER_TOP)
wlr_scene_node_reparent(xdg_surface->surface->data, layers[LyrTop]);
if (!(c = toplevel) || !c->mon)
return; return;
box = c->type == LayerShell ? c->mon->m : c->mon->w; box = c->type == LayerShell ? c->mon->m : c->mon->w;
box.x -= c->geom.x; box.x -= c->geom.x;