[Scummvm-cvs-logs] SF.net SVN: scummvm:[52055] scummvm/branches/gsoc2010-opengl/backends/ graphics/openglsdl/openglsdl-graphics.cpp

[vgvgf at users.sourceforge.net]

Revision: 52055
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52055&view=rev
Author:   vgvgf
Date:     2010-08-13 05:00:38 +0000 (Fri, 13 Aug 2010)

Log Message:
-----------
OPENGL: Disable resizable window when not using an aspect ratio correction.

Modified Paths:
--------------
    scummvm/branches/gsoc2010-opengl/backends/graphics/openglsdl/openglsdl-graphics.cpp

Modified: scummvm/branches/gsoc2010-opengl/backends/graphics/openglsdl/openglsdl-graphics.cpp
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/graphics/openglsdl/openglsdl-graphics.cpp	2010-08-13 04:48:58 UTC (rev 52054)
+++ scummvm/branches/gsoc2010-opengl/backends/graphics/openglsdl/openglsdl-graphics.cpp	2010-08-13 05:00:38 UTC (rev 52055)
@@ -356,10 +356,15 @@
 			// Failed setuping a fullscreen mode
 			return false;
 
+	uint32 flags = SDL_OPENGL;
+
+	if (_videoMode.fullscreen)
+		flags |= SDL_FULLSCREEN;
+	else if (_videoMode.aspectRatioCorrection == kAspectRatioNone)
+		flags |= SDL_RESIZABLE;
+
 	// Create our window
-	_hwscreen = SDL_SetVideoMode(_videoMode.hardwareWidth, _videoMode.hardwareHeight, 32,
-		_videoMode.fullscreen ? (SDL_FULLSCREEN | SDL_OPENGL) : (SDL_OPENGL | SDL_RESIZABLE)
-	);
+	_hwscreen = SDL_SetVideoMode(_videoMode.hardwareWidth, _videoMode.hardwareHeight, 32, flags);
 #ifdef USE_RGB_COLOR
 	detectSupportedFormats();
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.