semfault/dwl
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into scenegraph

Browse source
This commit is contained in:
Leonardo Hernández Hernández 2022-03-18 01:31:28 -06:00
parent 475c134144 1dfd867d9c
commit d50bb97f56
No known key found for this signature in database
GPG key ID: E538897EE11B9624
2 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
client.h
View file

@ -199,3 +199,24 @@ client_min_size(Client *c, int *width, int *height)
*width = state->min_width; *width = state->min_width;
*height = state->min_height; *height = state->min_height;
} }
static inline Client *
client_from_popup(struct wlr_xdg_popup *popup)
{
struct wlr_xdg_surface *surface = popup->base;
while (1) {
switch (surface->role) {
case WLR_XDG_SURFACE_ROLE_POPUP:
if (!wlr_surface_is_xdg_surface(surface->popup->parent))
return NULL;
surface = wlr_xdg_surface_from_wlr_surface(surface->popup->parent);
break;
case WLR_XDG_SURFACE_ROLE_TOPLEVEL:
return surface->data;
case WLR_XDG_SURFACE_ROLE_NONE:
return NULL;
}
}
}

7
dwl.c
View file

@ -874,8 +874,15 @@ createnotify(struct wl_listener *listener, void *data)
Client *c; Client *c;
if (xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP) { if (xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP) {
struct wlr_box box;
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 = client_from_popup(xdg_surface->popup)) || !c->mon)
return;
box = c->mon->m;
box.x -= c->geom.x;
box.y -= c->geom.y;
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)
return; return;