edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #4104

Browse source 
4104: Fix fullscreen resolution setting on SDL 2.0.16 r=Jupeyy a=vainiovano

`SDL_SetWindowSize`'s documentation tells that `SDL_SetWindowDisplayMode` should be used to set the sizes of fullscreen windows. [SDL commit 72d812852023450b7c3850b8e87b63575df041ee](72d8128520) changed `SDL_SetWindowSize`'s behavior so that it can no longer be used to set the screen resolution with windows that are created in fullscreen mode. `SDL_SetWindowDisplaymode` can be used instead when the window is fullscreen.

## Checklist

- [X] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test if it works standalone, system.c especially
- [X] Considered possible null pointers and out of bounds array indexing
- [X] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


Co-authored-by: Väinö Mäkelä <vaino.o.makela@gmail.com>
This commit is contained in:
bors[bot] 2021-08-21 19:25:53 +00:00 committed by GitHub
parent 42f21c6dd9 d94f52b447
commit 7b3f300db8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/engine/client/backend_sdl.cpp
View file

@ -1114,7 +1114,17 @@ void CGraphicsBackend_SDL_OpenGL::SetWindowGrab(bool Grab)
void CGraphicsBackend_SDL_OpenGL::ResizeWindow(int w, int h)
{
SDL_SetWindowSize(m_pWindow, w, h);
if(SDL_GetWindowFlags(m_pWindow) & SDL_WINDOW_FULLSCREEN)
{
SDL_DisplayMode displaymode = {};
displaymode.w = w;
displaymode.h = h;
SDL_SetWindowDisplayMode(m_pWindow, &displaymode);
}
else
{
SDL_SetWindowSize(m_pWindow, w, h);
}
}
void CGraphicsBackend_SDL_OpenGL::GetViewportSize(int &w, int &h)