Fixing 'GLUT_BORDERLESS' on Windows per e-mail from Eero Pajarre dated 4/24/2011 9:19 AM

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@917 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
fayjf 2011-05-27 20:10:13 +00:00
parent 5fac63e885
commit 849856388a
2 changed files with 3 additions and 2 deletions

View File

@ -122,7 +122,8 @@ static void fghReshapeWindow ( SFG_Window *window, int width, int height )
if ( window->Parent == NULL ) if ( window->Parent == NULL )
{ {
if ( ! window->IsMenu && (window != fgStructure.GameModeWindow) ) if ( ! window->IsMenu && (window != fgStructure.GameModeWindow) &&
!( fgState.DisplayMode & GLUT_BORDERLESS ))
{ {
w += GetSystemMetrics( SM_CXSIZEFRAME ) * 2; w += GetSystemMetrics( SM_CXSIZEFRAME ) * 2;
h += GetSystemMetrics( SM_CYSIZEFRAME ) * 2 + h += GetSystemMetrics( SM_CYSIZEFRAME ) * 2 +

View File

@ -1286,7 +1286,7 @@ void fgOpenWindow( SFG_Window* window, const char* title,
else if ( fgState.DisplayMode & GLUT_BORDERLESS ) else if ( fgState.DisplayMode & GLUT_BORDERLESS )
{ {
SetWindowLong ( window->Window.Handle, GWL_STYLE, SetWindowLong ( window->Window.Handle, GWL_STYLE,
WindowStyle & ~(WS_BORDER | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX)); WindowStyle & ~(WS_BORDER | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_DLGFRAME | WS_SIZEBOX));
} }
/* SetWindowPos(window->Window.Handle, NULL, 0, 0, 0, 0, /* SetWindowPos(window->Window.Handle, NULL, 0, 0, 0, 0,
SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED); */ SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED); */