summaryrefslogtreecommitdiff
path: root/src/openglgraphics.cpp
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-01-21 12:30:36 +0100
committerAndrei Karas <akaras@inbox.ru>2012-01-30 19:53:07 +0300
commit8292b80eac900ec5dd75d184063b7b35934e800a (patch)
tree3ce68afff38d75d0cb1cdb89260f2b49f232e86a /src/openglgraphics.cpp
parent502a0a0163e702af7334979a2eabfc4826a94091 (diff)
downloadmv-8292b80eac900ec5dd75d184063b7b35934e800a.tar.gz
mv-8292b80eac900ec5dd75d184063b7b35934e800a.tar.bz2
mv-8292b80eac900ec5dd75d184063b7b35934e800a.tar.xz
mv-8292b80eac900ec5dd75d184063b7b35934e800a.zip
Allow resizing of the game in windowed mode
Window positions are semi-smartly corrected as a result of the resize. Not supported when using OpenGL on Windows for now. Reviewed-by: Yohann Ferreira Conflicts: src/client.cpp src/client.h src/game.cpp src/gui/gui.cpp src/gui/widgets/window.cpp
Diffstat (limited to 'src/openglgraphics.cpp')
-rw-r--r--src/openglgraphics.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp
index b744a3caf..9fb91b201 100644
--- a/src/openglgraphics.cpp
+++ b/src/openglgraphics.cpp
@@ -85,7 +85,17 @@ bool OpenGLGraphics::setVideoMode(int w, int h, int bpp, bool fs, bool hwaccel)
mHWAccel = hwaccel;
if (fs)
+ {
displayFlags |= SDL_FULLSCREEN;
+ }
+ else
+ {
+ // Resizing currently not supported on Windows, where it would require
+ // reuploading all textures.
+#if !defined(_WIN32)
+ displayFlags |= SDL_RESIZABLE;
+#endif
+ }
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
@@ -1017,6 +1027,7 @@ void OpenGLGraphics::_beginDraw()
void OpenGLGraphics::_endDraw()
{
+ popClipArea();
}
SDL_Surface* OpenGLGraphics::getScreenshot()