Skip to content

Commit bfa0c75

Browse files
committed
SDL fullscreen size fix for 2.0.22
1 parent 86bf524 commit bfa0c75

File tree

1 file changed

+41
-0
lines changed

1 file changed

+41
-0
lines changed

fsdeps/packages/SDL2

+41
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,47 @@ rm -Rf fsdeps/_build && mkdir fsdeps/_build && cd fsdeps/_build
1919
tar xf ../_sources/$PACKAGE.tar.gz
2020
cd $PACKAGE
2121

22+
patch -p1<<EOF
23+
diff --git a/src/video/x11/SDL_x11window.c b/src/video/x11/SDL_x11window.c
24+
index d31ac012ae00..3c78beaa5356 100644
25+
--- a/src/video/x11/SDL_x11window.c
26+
+++ b/src/video/x11/SDL_x11window.c
27+
@@ -27,6 +27,7 @@
28+
#include "../SDL_pixels_c.h"
29+
#include "../../events/SDL_keyboard_c.h"
30+
#include "../../events/SDL_mouse_c.h"
31+
+#include "../../events/SDL_events_c.h"
32+
33+
#include "SDL_x11video.h"
34+
#include "SDL_x11mouse.h"
35+
@@ -1392,12 +1393,19 @@ X11_SetWindowFullscreenViaWM(_THIS, SDL_Window * window, SDL_VideoDisplay * _dis
36+
attrs.x, attrs.y, &x, &y, &childReturn);
37+
38+
if (!caught_x11_error) {
39+
- if ((x != orig_x) || (y != orig_y) || (attrs.width != orig_w) || (attrs.height != orig_h)) {
40+
- window->x = x;
41+
- window->y = y;
42+
- window->w = attrs.width;
43+
- window->h = attrs.height;
44+
- break; /* window moved, time to go. */
45+
+ SDL_bool window_changed = SDL_FALSE;
46+
+ if ((x != orig_x) || (y != orig_y)) {
47+
+ SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_MOVED, x, y);
48+
+ window_changed = SDL_TRUE;
49+
+ }
50+
+
51+
+ if ((attrs.width != orig_w) || (attrs.height != orig_h)) {
52+
+ SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_RESIZED, attrs.width, attrs.height);
53+
+ window_changed = SDL_TRUE;
54+
+ }
55+
+
56+
+ if (window_changed) {
57+
+ break; /* window changed, time to go. */
58+
}
59+
}
60+
61+
EOF
62+
2263
patch -p1 <<EOF
2364
diff --git a/src/joystick/windows/SDL_windows_gaming_input.c b/src/joystick/windows/SDL_windows_gaming_input.c
2465
index 8b552bb7dad..c1608a797ae 100644

0 commit comments

Comments
 (0)