From 8292b80eac900ec5dd75d184063b7b35934e800a Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Sat, 21 Jan 2012 12:30:36 +0100 Subject: 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 --- src/opengl1graphics.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/opengl1graphics.cpp') diff --git a/src/opengl1graphics.cpp b/src/opengl1graphics.cpp index 6f712f698..7995b122b 100644 --- a/src/opengl1graphics.cpp +++ b/src/opengl1graphics.cpp @@ -76,7 +76,17 @@ bool OpenGL1Graphics::setVideoMode(int w, int h, int bpp, 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); @@ -472,6 +482,7 @@ void OpenGL1Graphics::_beginDraw() void OpenGL1Graphics::_endDraw() { + popClipArea(); } SDL_Surface* OpenGL1Graphics::getScreenshot() -- cgit v1.2.3-70-g09d2