From 7cdf4fd7eeff5adaafb638c1196c816cc08dd79c Mon Sep 17 00:00:00 2001
From: Frank Praznik <[EMAIL REDACTED]>
Date: Wed, 6 May 2026 12:41:53 -0400
Subject: [PATCH] wayland: Ensure window dimensions are greater than zero after
adjusting for aspect
Resizing to zero can cause a bad viewport size error.
(cherry picked from commit ba3577f5846d3aa6fd074c4decc18eac747b514e)
---
src/video/wayland/SDL_waylandwindow.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c
index 0c7636988af16..b56f543d3643c 100644
--- a/src/video/wayland/SDL_waylandwindow.c
+++ b/src/video/wayland/SDL_waylandwindow.c
@@ -946,9 +946,9 @@ static void handle_xdg_toplevel_configure(void *data,
const float aspect = (float)wind->requested.logical_width / (float)wind->requested.logical_height;
if (window->min_aspect != 0.f && aspect < window->min_aspect) {
- wind->requested.logical_height = SDL_lroundf((float)wind->requested.logical_width / window->min_aspect);
+ wind->requested.logical_height = SDL_max(SDL_lroundf((float)wind->requested.logical_width / window->min_aspect), 1);
} else if (window->max_aspect != 0.f && aspect > window->max_aspect) {
- wind->requested.logical_width = SDL_lroundf((float)wind->requested.logical_height * window->max_aspect);
+ wind->requested.logical_width = SDL_max(SDL_lroundf((float)wind->requested.logical_height * window->max_aspect), 1);
}
} else {
if (window->max_w > 0) {
@@ -965,9 +965,9 @@ static void handle_xdg_toplevel_configure(void *data,
const float aspect = (float)wind->requested.pixel_width / (float)wind->requested.pixel_height;
if (window->min_aspect != 0.f && aspect < window->min_aspect) {
- wind->requested.pixel_height = SDL_lroundf((float)wind->requested.pixel_width / window->min_aspect);
+ wind->requested.pixel_height = SDL_max(SDL_lroundf((float)wind->requested.pixel_width / window->min_aspect), 1);
} else if (window->max_aspect != 0.f && aspect > window->max_aspect) {
- wind->requested.pixel_width = SDL_lroundf((float)wind->requested.pixel_height * window->max_aspect);
+ wind->requested.pixel_width = SDL_max(SDL_lroundf((float)wind->requested.pixel_height * window->max_aspect), 1);
}
wind->requested.logical_width = PixelToPoint(window, wind->requested.pixel_width);
@@ -1392,9 +1392,9 @@ static void decoration_frame_configure(struct libdecor_frame *frame,
const float aspect = (float)wind->requested.logical_width / (float)wind->requested.logical_height;
if (window->min_aspect != 0.f && aspect < window->min_aspect) {
- wind->requested.logical_height = SDL_lroundf((float)wind->requested.logical_width / window->min_aspect);
+ wind->requested.logical_height = SDL_max(SDL_lroundf((float)wind->requested.logical_width / window->min_aspect), 1);
} else if (window->max_aspect != 0.f && aspect > window->max_aspect) {
- wind->requested.logical_width = SDL_lroundf((float)wind->requested.logical_height * window->max_aspect);
+ wind->requested.logical_width = SDL_max(SDL_lroundf((float)wind->requested.logical_height * window->max_aspect), 1);
}
} else {
if (window->max_w > 0) {
@@ -1411,9 +1411,9 @@ static void decoration_frame_configure(struct libdecor_frame *frame,
const float aspect = (float)wind->requested.pixel_width / (float)wind->requested.pixel_height;
if (window->min_aspect != 0.f && aspect < window->min_aspect) {
- wind->requested.pixel_height = SDL_lroundf((float)wind->requested.pixel_width / window->min_aspect);
+ wind->requested.pixel_height = SDL_max(SDL_lroundf((float)wind->requested.pixel_width / window->min_aspect), 1);
} else if (window->max_aspect != 0.f && aspect > window->max_aspect) {
- wind->requested.pixel_width = SDL_lroundf((float)wind->requested.pixel_height * window->max_aspect);
+ wind->requested.pixel_width = SDL_max(SDL_lroundf((float)wind->requested.pixel_height * window->max_aspect), 1);
}
wind->requested.logical_width = PixelToPoint(window, wind->requested.pixel_width);