From 12cb46d94edd675a2788cb138112e4cdfbb7eaa6 Mon Sep 17 00:00:00 2001 From: terminx Date: Thu, 15 Aug 2019 16:57:26 +0000 Subject: [PATCH] Fix borderless windowed fullscreen mode git-svn-id: https://svn.eduke32.com/eduke32@8020 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/build/src/sdlayer.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source/build/src/sdlayer.cpp b/source/build/src/sdlayer.cpp index 47c09c113..79a89b98a 100644 --- a/source/build/src/sdlayer.cpp +++ b/source/build/src/sdlayer.cpp @@ -1586,7 +1586,7 @@ int32_t videoSetMode(int32_t x, int32_t y, int32_t c, int32_t fs) SDL_DisplayMode desktopmode; SDL_GetDesktopDisplayMode(0, &desktopmode); - int const windowedMode = (desktopmode.w == x && desktopmode.h == y) ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0; + int const windowedMode = (desktopmode.w == x && desktopmode.h == y) ? SDL_WINDOW_BORDERLESS : 0; #ifdef USE_OPENGL if (c > 8 || !nogl) @@ -1649,7 +1649,8 @@ int32_t videoSetMode(int32_t x, int32_t y, int32_t c, int32_t fs) return -1; } - SDL_SetWindowFullscreen(sdl_window, ((fs & 1) ? SDL_WINDOW_FULLSCREEN : windowedMode)); + // this is using the windowedMode variable to determine whether to pass SDL_WINDOW_FULLSCREEN or SDL_WINDOW_FULLSCREEN_DESKTOP + SDL_SetWindowFullscreen(sdl_window, ((fs & 1) ? windowedMode ? SDL_WINDOW_FULLSCREEN_DESKTOP : SDL_WINDOW_FULLSCREEN : windowedMode)); SDL_GL_SetSwapInterval(vsync_renderlayer); setrefreshrate();