From a160acfee096bef8a8c51194efa8e2262e719125 Mon Sep 17 00:00:00 2001 From: "John F. Fay" Date: Fri, 27 May 2011 20:12:02 +0000 Subject: [PATCH] Fixing 'glutGet' processing for 'GLUT_BORDERLESS' on Windows per e-mail from Eero Pajarre dated 4/24/2011 10:17 AM git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@918 7f0cb862-5218-0410-a997-914c9d46530a --- src/freeglut_state.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/freeglut_state.c b/src/freeglut_state.c index 9126c4f..1cabb9d 100644 --- a/src/freeglut_state.c +++ b/src/freeglut_state.c @@ -468,7 +468,8 @@ int FGAPIENTRY glutGet( GLenum eWhat ) #if !defined(_WIN32_WCE) if ( ( fgStructure.GameModeWindow != fgStructure.CurrentWindow ) && ( fgStructure.CurrentWindow->Parent == NULL ) && - ( ! fgStructure.CurrentWindow->IsMenu ) ) + ( ! fgStructure.CurrentWindow->IsMenu ) && + !( fgState.DisplayMode & GLUT_BORDERLESS )) { winRect.left += GetSystemMetrics( SM_CXSIZEFRAME ); winRect.right -= GetSystemMetrics( SM_CXSIZEFRAME ); @@ -491,6 +492,8 @@ int FGAPIENTRY glutGet( GLenum eWhat ) #if defined(_WIN32_WCE) return 0; #else + if ( fgState.DisplayMode & GLUT_BORDERLESS ) + return 0; return GetSystemMetrics( SM_CXSIZEFRAME ); #endif /* !defined(_WIN32_WCE) */ @@ -498,6 +501,8 @@ int FGAPIENTRY glutGet( GLenum eWhat ) #if defined(_WIN32_WCE) return 0; #else + if ( fgState.DisplayMode & GLUT_BORDERLESS ) + return 0; return GetSystemMetrics( SM_CYCAPTION ); #endif /* defined(_WIN32_WCE) */ -- 1.7.10.4