diff --git a/third-party/SDL/src/video/x11/SDL_x11window.c b/third-party/SDL/src/video/x11/SDL_x11window.c index 25aa25fd11..9ed8337759 100644 --- a/third-party/SDL/src/video/x11/SDL_x11window.c +++ b/third-party/SDL/src/video/x11/SDL_x11window.c @@ -999,6 +999,10 @@ X11_SetWindowSize(_THIS, SDL_Window * window) } if (SDL_TICKS_PASSED(SDL_GetTicks(), timeout)) { + /* Timeout occurred and window size didn't change + * wwindow manager likely denied the resize. */ + window->w = orig_w; + window->h = orig_h; break; } diff --git a/vendor.yaml b/vendor.yaml index 08d0821b83..00bcc38d40 100644 --- a/vendor.yaml +++ b/vendor.yaml @@ -26,6 +26,8 @@ third-party/fmt: git: bce8d4ed087a0560492426f9f5be2713804daded third-party/SDL: git: https://github.com/libsdl-org/SDL/tree/release-2.26.5 + modifications: + - "PR #2691" third-party/imgui: git: https://github.com/ocornut/imgui/tree/v1.89.2 third-party/tree-sitter: