fdo-mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-12-20 08:00:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

xdg-surface: ensure that the effective geom is not empty

Browse source 
Fixes: 5c98d1a04a
This commit is contained in:
Kirill Primak 2025-04-13 13:25:14 +03:00
parent 7161bcfabc
commit 5dc73937ff
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
types/xdg_shell/wlr_xdg_surface.c
View file

@ -262,6 +262,10 @@ static void update_geometry(struct wlr_xdg_surface *surface) {
wlr_surface_get_extents(surface->surface, &surface->geometry); wlr_surface_get_extents(surface->surface, &surface->geometry);
wlr_box_intersection(&surface->geometry, wlr_box_intersection(&surface->geometry,
&surface->current.geometry, &surface->geometry); &surface->current.geometry, &surface->geometry);
if (wlr_box_empty(&surface->geometry)) {
wl_resource_post_error(surface->resource, XDG_SURFACE_ERROR_INVALID_SIZE,
"the effective window geometry is empty");
}
} }
} else { } else {
wlr_surface_get_extents(surface->surface, &surface->geometry); wlr_surface_get_extents(surface->surface, &surface->geometry);
@ -332,10 +336,10 @@ static void xdg_surface_role_commit(struct wlr_surface *wlr_surface) {
break; break;
} }
if (wlr_surface->mapped) { if (!wlr_surface->mapped && wlr_surface_has_buffer(wlr_surface)) {
update_geometry(surface);
} else if (wlr_surface_has_buffer(wlr_surface)) {
wlr_surface_map(wlr_surface); wlr_surface_map(wlr_surface);
} else {
update_geometry(surface);
} }
} }