thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OPENGL: Do not allow changing to a not supported scale while on fullscreen.

Browse source 
svn-id: r51292
This commit is contained in:
Alejandro Marzini 2010-07-26 04:40:00 +00:00
parent 19ce960868
commit 37cdff9277
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
backends/graphics/opengl/opengl-graphics.cpp
View file

@ -931,8 +931,16 @@ void OpenGLGraphicsManager::setScale(int newScale) {
if (newScale == _videoMode.scaleFactor) if (newScale == _videoMode.scaleFactor)
return; return;
_videoMode.scaleFactor = newScale; switch (newScale) {
case OpenGL::GFX_NORMAL:
_videoMode.mode = OpenGL::GFX_NORMAL;
case OpenGL::GFX_DOUBLESIZE:
_videoMode.mode = OpenGL::GFX_DOUBLESIZE;
case OpenGL::GFX_TRIPLESIZE:
_videoMode.mode = OpenGL::GFX_TRIPLESIZE;
}
_videoMode.scaleFactor = newScale;
_transactionDetails.sizeChanged = true; _transactionDetails.sizeChanged = true;
} }

2
backends/graphics/openglsdl/openglsdl-graphics.cpp
View file

@ -183,6 +183,8 @@ bool OpenGLSdlGraphicsManager::loadGFXMode() {
_videoMode.hardwareWidth = bestMode->w; _videoMode.hardwareWidth = bestMode->w;
_videoMode.hardwareHeight = bestMode->h; _videoMode.hardwareHeight = bestMode->h;
} else { } else {
if (_oldVideoMode.fullscreen)
return false;
_videoMode.fullscreen = false; _videoMode.fullscreen = false;
} }
} }