From: <fa...@us...> - 2011-05-27 20:12:08
|
Revision: 918 http://freeglut.svn.sourceforge.net/freeglut/?rev=918&view=rev Author: fayjf Date: 2011-05-27 20:12:02 +0000 (Fri, 27 May 2011) Log Message: ----------- Fixing 'glutGet' processing for 'GLUT_BORDERLESS' on Windows per e-mail from Eero Pajarre dated 4/24/2011 10:17 AM Modified Paths: -------------- trunk/freeglut/freeglut/src/freeglut_state.c Modified: trunk/freeglut/freeglut/src/freeglut_state.c =================================================================== --- trunk/freeglut/freeglut/src/freeglut_state.c 2011-05-27 20:10:13 UTC (rev 917) +++ trunk/freeglut/freeglut/src/freeglut_state.c 2011-05-27 20:12:02 UTC (rev 918) @@ -468,7 +468,8 @@ #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 @@ #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 @@ #if defined(_WIN32_WCE) return 0; #else + if ( fgState.DisplayMode & GLUT_BORDERLESS ) + return 0; return GetSystemMetrics( SM_CYCAPTION ); #endif /* defined(_WIN32_WCE) */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |