ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2025-06-13 05:55:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix window size in X11 when window manager refuses to resize

Browse source 
(cherry picked from commit a67ae8eed57f4545c739e6eb3a4b8c1169d3afbc)
This commit is contained in:
Le Philousophe 2023-02-18 18:21:09 +01:00 committed by Sam Lantinga
parent f741adc86c
commit 74e8a6451b
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/video/x11/SDL_x11window.c
View file

@ -418,7 +418,7 @@ int X11_CreateWindow(_THIS, SDL_Window *window)
#if SDL_VIDEO_OPENGL_EGL #if SDL_VIDEO_OPENGL_EGL
if (((_this->gl_config.profile_mask == SDL_GL_CONTEXT_PROFILE_ES) || if (((_this->gl_config.profile_mask == SDL_GL_CONTEXT_PROFILE_ES) ||
SDL_GetHintBoolean(SDL_HINT_VIDEO_X11_FORCE_EGL, SDL_FALSE)) SDL_GetHintBoolean(SDL_HINT_VIDEO_X11_FORCE_EGL, SDL_FALSE))
#if SDL_VIDEO_OPENGL_GLX #if SDL_VIDEO_OPENGL_GLX
&& ( !_this->gl_data || X11_GL_UseEGL(_this) ) && ( !_this->gl_data || X11_GL_UseEGL(_this) )
#endif #endif
) { ) {
@ -641,9 +641,9 @@ int X11_CreateWindow(_THIS, SDL_Window *window)
if ((window->flags & SDL_WINDOW_OPENGL) && if ((window->flags & SDL_WINDOW_OPENGL) &&
((_this->gl_config.profile_mask == SDL_GL_CONTEXT_PROFILE_ES) || ((_this->gl_config.profile_mask == SDL_GL_CONTEXT_PROFILE_ES) ||
SDL_GetHintBoolean(SDL_HINT_VIDEO_X11_FORCE_EGL, SDL_FALSE)) SDL_GetHintBoolean(SDL_HINT_VIDEO_X11_FORCE_EGL, SDL_FALSE))
#if SDL_VIDEO_OPENGL_GLX #if SDL_VIDEO_OPENGL_GLX
&& ( !_this->gl_data || X11_GL_UseEGL(_this) ) && ( !_this->gl_data || X11_GL_UseEGL(_this) )
#endif #endif
) { ) {
#if SDL_VIDEO_OPENGL_EGL #if SDL_VIDEO_OPENGL_EGL
if (!_this->egl_data) { if (!_this->egl_data) {
@ -979,6 +979,10 @@ void X11_SetWindowSize(_THIS, SDL_Window *window)
} }
if (SDL_TICKS_PASSED(SDL_GetTicks(), timeout)) { 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; break;
} }