diff --git a/neo/sys/sdl/sdl_events.cpp b/neo/sys/sdl/sdl_events.cpp index ebbfc042..2b157dec 100644 --- a/neo/sys/sdl/sdl_events.cpp +++ b/neo/sys/sdl/sdl_events.cpp @@ -975,7 +975,7 @@ sysEvent_t Sys_GetEvent() if( !renderSystem->IsFullScreen() ) { // SRS - If window was maximized by window manager set to borderless fullscreen mode = -2 - SDL_Window *window = SDL_GetWindowFromID( ev.window.windowID ); + SDL_Window* window = SDL_GetWindowFromID( ev.window.windowID ); if( SDL_GetWindowFlags( window ) & SDL_WINDOW_MAXIMIZED ) { SDL_SetWindowFullscreen( window, SDL_WINDOW_FULLSCREEN_DESKTOP ); @@ -1004,7 +1004,7 @@ sysEvent_t Sys_GetEvent() int y = ev.window.data2; // SRS - Only save window moved events when in windowed mode and not maximized by window manager - SDL_Window *window = SDL_GetWindowFromID( ev.window.windowID ); + SDL_Window* window = SDL_GetWindowFromID( ev.window.windowID ); if( !renderSystem->IsFullScreen() && !( SDL_GetWindowFlags( window ) & SDL_WINDOW_MAXIMIZED ) ) { // SRS - take window border into account when when saving window position cvars diff --git a/neo/sys/sdl/sdl_vkimp.cpp b/neo/sys/sdl/sdl_vkimp.cpp index 298d14c9..64586a75 100755 --- a/neo/sys/sdl/sdl_vkimp.cpp +++ b/neo/sys/sdl/sdl_vkimp.cpp @@ -347,7 +347,7 @@ static int ScreenParmsHandleDisplayIndex( glimpParms_t parms ) } int displayIdx = GetDisplayIndex( parms ); - + if( parms.fullScreen > 0 ) { if( displayIdx < 0 ) @@ -437,7 +437,7 @@ static bool SetScreenParmsWindowed( glimpParms_t parms ) // SRS - window is out of bounds for desktop, reposition onto default display windowPosX = windowPosY = SDL_WINDOWPOS_UNDEFINED; } - + // SRS - handle differences in WM behaviour: for macOS set position first, for linux set it last #if defined(__APPLE__) SDL_SetWindowPosition( window, windowPosX, windowPosY ); diff --git a/neo/sys/win32/win_glimp.cpp b/neo/sys/win32/win_glimp.cpp index 07586fcc..d5275caa 100755 --- a/neo/sys/win32/win_glimp.cpp +++ b/neo/sys/win32/win_glimp.cpp @@ -617,7 +617,7 @@ static int GetDisplayNum( glimpParms_t parms ) } else // 0, -1, -2 == windowed and borderless window modes { - // SRS - Find display containing the center of the window, return -1 if not found + // SRS - Find display containing the center of the window, return -1 if not found int windowPosX = parms.x + parms.width / 2; int windowPosY = parms.y + parms.height / 2; @@ -673,7 +673,7 @@ static bool GLW_GetWindowDimensions( const glimpParms_t parms, int& x, int& y, i // SRS - for windowed modes use specified parms coordinates, otherwise skip and return display coordinates from above if( parms.fullScreen == 0 || parms.fullScreen == -1 ) { - // If couldn't find display number and center of window is out of bounds for the desktop, center on primary monitor + // If couldn't find display number and center of window is out of bounds for the desktop, center on primary monitor int offsetX = 0, offsetY = 0; if( displayNotFound ) { @@ -1128,7 +1128,7 @@ bool GLimp_Init( glimpParms_t parms ) glConfig.isFullscreen = parms.fullScreen; glConfig.isStereoPixelFormat = parms.stereo; - + // SRS - For fullscreen borderless windowed mode == -2 need to use actual display dimensions if( parms.fullScreen == -2 ) { @@ -1146,7 +1146,7 @@ bool GLimp_Init( glimpParms_t parms ) glConfig.nativeScreenWidth = parms.width; glConfig.nativeScreenHeight = parms.height; } - + glConfig.displayFrequency = GetDisplayFrequency( parms ); glConfig.multisamples = parms.multiSamples;