incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix resolution being forced back to 320x200 (again)

Browse source
This commit is contained in:
Gustaf Alhäll 2025-12-05 21:54:00 +01:00 committed by NepDisk
parent aff75e6624
commit c093fdce8e
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/sdl/i_video.cpp
View file

@ -113,6 +113,9 @@ UINT8 graphics_started = 0; // Is used in console.c and screen.c
boolean allow_fullscreen = false; boolean allow_fullscreen = false;
static bool disable_fullscreen = false; static bool disable_fullscreen = false;
// hack to avoid resolution being forced back to 320x200 on entering fullscreen
static bool just_switched;
#define USE_FULLSCREEN (disable_fullscreen||!allow_fullscreen)?static_cast<bool>(0):static_cast<bool>(cv_fullscreen.value == 1) #define USE_FULLSCREEN (disable_fullscreen||!allow_fullscreen)?static_cast<bool>(0):static_cast<bool>(cv_fullscreen.value == 1)
static bool disable_mouse = false; static bool disable_mouse = false;
@ -301,6 +304,7 @@ static bool SDLSetMode(INT32 width, INT32 height, bool fullscreen, bool repositi
{ {
static bool wasfullscreen = false; static bool wasfullscreen = false;
int fullscreen_type = SDL_WINDOW_FULLSCREEN; int fullscreen_type = SDL_WINDOW_FULLSCREEN;
just_switched = true;
src_rect.w = vid.width = width; src_rect.w = vid.width = width;
src_rect.h = vid.height = height; src_rect.h = vid.height = height;
@ -336,19 +340,13 @@ static bool SDLSetMode(INT32 width, INT32 height, bool fullscreen, bool repositi
} }
else else
{ {
SDL_Window *win = Impl_CreateWindow(); window = Impl_CreateWindow();
if (win == NULL) if (window == NULL)
return false; return false;
wasfullscreen = fullscreen; wasfullscreen = fullscreen;
SDL_SetWindowSize(win, width, height);
if (fullscreen) if (fullscreen)
SDL_SetWindowFullscreen(win, fullscreen_type); SDL_SetWindowFullscreen(window, fullscreen_type);
SDL_SyncWindow(win);
// set the window variable here, so asynchronous events don't break resolution
window = win;
} }
if (Impl_RenderContextReset() == false) if (Impl_RenderContextReset() == false)
@ -659,8 +657,9 @@ static void Impl_HandleWindowEvent(SDL_WindowEvent evt)
mousefocus = false; mousefocus = false;
break; break;
case SDL_EVENT_WINDOW_MAXIMIZED: case SDL_EVENT_WINDOW_MAXIMIZED:
break; case SDL_EVENT_WINDOW_RESIZED:
case SDL_EVENT_WINDOW_PIXEL_SIZE_CHANGED: case SDL_EVENT_WINDOW_PIXEL_SIZE_CHANGED:
just_switched = false;
break; break;
default: default:
return; return;