use the layer surface to create popups

main
Leonardo Hernández Hernández 2022-07-24 16:43:13 -05:00
parent b04c73be3d
commit 7eee0a8229
No known key found for this signature in database
GPG Key ID: E538897EE11B9624
1 changed files with 6 additions and 7 deletions

13
dwl.c
View File

@ -967,18 +967,17 @@ 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; LayerSurface *l = toplevel_from_popup(xdg_surface->popup);
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 (wlr_surface_is_layer_surface(xdg_surface->popup->parent) && (l = toplevel) if (wlr_surface_is_layer_surface(xdg_surface->popup->parent) && l
&& l->layer_surface->current.layer < ZWLR_LAYER_SHELL_V1_LAYER_TOP) && l->layer_surface->current.layer < ZWLR_LAYER_SHELL_V1_LAYER_TOP)
wlr_scene_node_reparent(xdg_surface->surface->data, layers[LyrTop]); wlr_scene_node_reparent(xdg_surface->surface->data, layers[LyrTop]);
if (!(c = toplevel) || !c->mon) if (!l || !l->mon)
return; return;
box = c->type == LayerShell ? c->mon->m : c->mon->w; box = l->type == LayerShell ? l->mon->m : l->mon->w;
box.x -= c->geom.x; box.x -= l->geom.x;
box.y -= c->geom.y; box.y -= l->geom.y;
wlr_xdg_popup_unconstrain_from_box(xdg_surface->popup, &box); wlr_xdg_popup_unconstrain_from_box(xdg_surface->popup, &box);
return; return;
} else if (xdg_surface->role == WLR_XDG_SURFACE_ROLE_NONE) } else if (xdg_surface->role == WLR_XDG_SURFACE_ROLE_NONE)