encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

x11: revert checks for _NET_WM_STATE_FULLSCREEN changes. 

This reverts commit 85977354fb.
This reverts commit 0249df9d96.

Fixes #5572.
Reopens #5390.
This commit is contained in:
Ryan C. Gordon 2022-04-25 13:51:15 -04:00
parent 981e1e3c44
commit 53dea98309
No known key found for this signature in database
GPG Key ID: FA148B892AB48044
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/video/x11/SDL_x11events.c
View File

@ -1450,17 +1450,6 @@ X11_DispatchEvent(_THIS, XEvent *xevent)
} }
} }
/* FULLSCREEN_DESKTOP encompasses two bits: SDL_WINDOW_FULLSCREEN, plus a bit to note it's FULLSCREEN_DESKTOP */
if (changed & SDL_WINDOW_FULLSCREEN_DESKTOP) {
SDL_VideoDisplay *viddisplay = SDL_GetDisplayForWindow(data->window);
const Uint32 fsmasked = flags & SDL_WINDOW_FULLSCREEN_DESKTOP;
data->window->flags &= ~SDL_WINDOW_FULLSCREEN_DESKTOP;
data->window->flags |= fsmasked;
if (viddisplay) {
viddisplay->fullscreen_window = fsmasked ? data->window : NULL;
}
}
if (changed & SDL_WINDOW_MAXIMIZED) { if (changed & SDL_WINDOW_MAXIMIZED) {
if (flags & SDL_WINDOW_MAXIMIZED) { if (flags & SDL_WINDOW_MAXIMIZED) {
SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_MAXIMIZED, 0, 0); SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_MAXIMIZED, 0, 0);

2
src/video/x11/SDL_x11window.c
View File

@ -222,7 +222,7 @@ X11_GetNetWMState(_THIS, Window xwindow)
} }
if (fullscreen == 1) { if (fullscreen == 1) {
flags |= SDL_WINDOW_FULLSCREEN_DESKTOP; flags |= SDL_WINDOW_FULLSCREEN;
} }
/* If the window is unmapped, numItems will be zero and _NET_WM_STATE_HIDDEN /* If the window is unmapped, numItems will be zero and _NET_WM_STATE_HIDDEN