You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
58 lines
2.4 KiB
58 lines
2.4 KiB
3 years ago
|
From 77a9ca6ba0ae1973d7bc255a4d785e7f1ba3d111 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Cameron Gutman <aicommander@gmail.com>
|
||
|
|
Date: Wed, 26 Jan 2022 18:26:07 -0600
|
||
|
|
Subject: [PATCH 08/11] wayland: Fix SDL_SetWindowSize() being dropped right
|
||
|
|
after exiting fullscreen
|
||
|
|
|
||
|
|
If we get a SDL_SetWindowSize() call right after SDL_SetWindowFullscreen() but
|
||
|
|
before we've gotten a new configure event from the compositor, the attempt to
|
||
|
|
set our window size will silently fail (when libdecor is enabled).
|
||
|
|
|
||
|
|
Fix this by remembering that we need to commit a new size, so we can do that
|
||
|
|
in decoration_frame_configure().
|
||
|
|
---
|
||
|
|
src/video/wayland/SDL_waylandwindow.c | 5 ++++-
|
||
|
|
src/video/wayland/SDL_waylandwindow.h | 1 +
|
||
|
|
2 files changed, 5 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c
|
||
|
|
index 4c3c60aac..635546af4 100644
|
||
|
|
--- a/src/video/wayland/SDL_waylandwindow.c
|
||
|
|
+++ b/src/video/wayland/SDL_waylandwindow.c
|
||
|
|
@@ -414,9 +414,10 @@ decoration_frame_configure(struct libdecor_frame *frame,
|
||
|
|
if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) {
|
||
|
|
scale_factor = driverdata->scale_factor;
|
||
|
|
}
|
||
|
|
- } else if (!(window->flags & SDL_WINDOW_RESIZABLE)) {
|
||
|
|
+ } else if (!(window->flags & SDL_WINDOW_RESIZABLE) || (floating && wind->floating_resize_pending)) {
|
||
|
|
width = window->windowed.w;
|
||
|
|
height = window->windowed.h;
|
||
|
|
+ wind->floating_resize_pending = SDL_FALSE;
|
||
|
|
} else {
|
||
|
|
/* This will never set 0 for width/height unless the function returns false */
|
||
|
|
if (!libdecor_configuration_get_content_size(configuration, frame, &width, &height)) {
|
||
|
|
@@ -1424,6 +1425,8 @@ void Wayland_SetWindowSize(_THIS, SDL_Window * window)
|
||
|
|
if (data->shell.libdecor &&
|
||
|
|
wind->shell_surface.libdecor.frame &&
|
||
|
|
!libdecor_frame_is_floating(wind->shell_surface.libdecor.frame)) {
|
||
|
|
+ /* Commit the resize when we re-enter floating state */
|
||
|
|
+ wind->floating_resize_pending = SDL_TRUE;
|
||
|
|
return;
|
||
|
|
}
|
||
|
|
#endif
|
||
|
|
diff --git a/src/video/wayland/SDL_waylandwindow.h b/src/video/wayland/SDL_waylandwindow.h
|
||
|
|
index e8d7d6299..90e4d8cf6 100644
|
||
|
|
--- a/src/video/wayland/SDL_waylandwindow.h
|
||
|
|
+++ b/src/video/wayland/SDL_waylandwindow.h
|
||
|
|
@@ -87,6 +87,7 @@ typedef struct {
|
||
|
|
|
||
|
|
float scale_factor;
|
||
|
|
SDL_bool needs_resize_event;
|
||
|
|
+ SDL_bool floating_resize_pending;
|
||
|
|
} SDL_WindowData;
|
||
|
|
|
||
|
|
extern void Wayland_ShowWindow(_THIS, SDL_Window *window);
|
||
|
|
--
|
||
|
|
2.34.1
|
||
|
|
|