Fixing 'glutGet' processing for 'GLUT_BORDERLESS' on Windows per e-mail from Eero Pajarre dated 4/24/2011 10:17 AM

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@918 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
fayjf 2011-05-27 20:12:02 +00:00
parent 849856388a
commit 7b62a4fb84

View File

@ -468,7 +468,8 @@ int FGAPIENTRY glutGet( GLenum eWhat )
#if !defined(_WIN32_WCE) #if !defined(_WIN32_WCE)
if ( ( fgStructure.GameModeWindow != fgStructure.CurrentWindow ) && ( fgStructure.CurrentWindow->Parent == NULL ) && 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.left += GetSystemMetrics( SM_CXSIZEFRAME );
winRect.right -= GetSystemMetrics( SM_CXSIZEFRAME ); winRect.right -= GetSystemMetrics( SM_CXSIZEFRAME );
@ -491,6 +492,8 @@ int FGAPIENTRY glutGet( GLenum eWhat )
#if defined(_WIN32_WCE) #if defined(_WIN32_WCE)
return 0; return 0;
#else #else
if ( fgState.DisplayMode & GLUT_BORDERLESS )
return 0;
return GetSystemMetrics( SM_CXSIZEFRAME ); return GetSystemMetrics( SM_CXSIZEFRAME );
#endif /* !defined(_WIN32_WCE) */ #endif /* !defined(_WIN32_WCE) */
@ -498,6 +501,8 @@ int FGAPIENTRY glutGet( GLenum eWhat )
#if defined(_WIN32_WCE) #if defined(_WIN32_WCE)
return 0; return 0;
#else #else
if ( fgState.DisplayMode & GLUT_BORDERLESS )
return 0;
return GetSystemMetrics( SM_CYCAPTION ); return GetSystemMetrics( SM_CYCAPTION );
#endif /* defined(_WIN32_WCE) */ #endif /* defined(_WIN32_WCE) */