commit c90d7b2d

sago007 · 2019-04-25 17:26
c90d7b2d84af5efb786bed73f30884283fd12d96 patch · browse files
parent e10e448dd2de75ac885b5bb75ef8637a84ec654f

Pick best display mode automatically

Changed files

M	source/code/main.cpp before

diff --git a/source/code/main.cpp b/source/code/main.cpp index 326dcae..446c474 100644 --- a/source/code/main.cpp +++ b/source/code/main.cpp

@@ -248,18 +248,25 @@ sago::SagoDataHolder dataHolder;

void ResetFullscreen() {

Mix_HaltMusic(); //We need to reload all data in case the screen type changes. Music must be stopped before unload.

if (globalData.bFullscreen) {

+ SDL_DisplayMode dm;

globalData.xsize = 1366;

globalData.ysize = 768;

+ if (SDL_GetDesktopDisplayMode(0, &dm) == 0) {

+ globalData.xsize = globalData.ysize*dm.w/(double)dm.h;

+ }

SDL_SetWindowFullscreen(sdlWindow, SDL_WINDOW_FULLSCREEN_DESKTOP);

}

else {

globalData.xsize = 1024;

- if (globalData.alwaysSixteenNine) {

- globalData.xsize = 1366;

- }

globalData.ysize = 768;

SDL_SetWindowFullscreen(sdlWindow, 0);

}

+ if (globalData.alwaysSixteenNine || globalData.xsize > 1366) {

+ globalData.xsize = 1366;

+ }

+ if (globalData.xsize < 1024) {

+ globalData.xsize = 1024;

+ }

SDL_RenderSetLogicalSize(globalData.screen, globalData.xsize, globalData.ysize);

dataHolder.invalidateAll(globalData.screen);

globalData.spriteHolder.reset(new sago::SagoSpriteHolder( dataHolder ) );