Skip to content

Commit 9d5d701

Browse files
committed
wayland: Ignore bogus libdecor content sizes if an unmapped window is suspended
If a client takes a long time to present the first frame after creating the window, a configure event to set the suspended state may arrive with libdecor increasing the content size by the decoration dimensions, which should be ignored.
1 parent 45480f5 commit 9d5d701

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

src/video/wayland/SDL_waylandwindow.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1326,8 +1326,13 @@ static void decoration_frame_configure(struct libdecor_frame *frame,
13261326
} else {
13271327
/* Don't apply the supplied dimensions if they haven't changed from the last configuration
13281328
* event, or a newer size set programmatically can be overwritten by old data.
1329+
*
1330+
* If a client takes a long time to present the first frame after creating the window, a
1331+
* configure event to set the suspended state may arrive with the content size increased
1332+
* by the decoration dimensions, which should also be ignored.
13291333
*/
1330-
if (width != wind->last_configure.width || height != wind->last_configure.height) {
1334+
if ((width != wind->last_configure.width || height != wind->last_configure.height) &&
1335+
!(wind->shell_surface_status == WAYLAND_SHELL_SURFACE_STATUS_WAITING_FOR_FRAME && wind->suspended != suspended)) {
13311336
wind->requested.logical_width = width;
13321337
wind->requested.logical_height = height;
13331338

0 commit comments

Comments
 (0)