Removed WindowState.IsGameMode; it is redundant with Structure.GameModeWindow
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@705 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
parent
94662b8d1b
commit
d38b3eeff0
@ -437,8 +437,6 @@ int FGAPIENTRY glutEnterGameMode( void )
|
|||||||
fgStructure.GameModeWindow->State.Height = fgState.GameModeSize.Y;
|
fgStructure.GameModeWindow->State.Height = fgState.GameModeSize.Y;
|
||||||
fgStructure.GameModeWindow->State.NeedToResize = GL_TRUE;
|
fgStructure.GameModeWindow->State.NeedToResize = GL_TRUE;
|
||||||
|
|
||||||
fgStructure.GameModeWindow->State.IsGameMode = GL_TRUE;
|
|
||||||
|
|
||||||
#if TARGET_HOST_POSIX_X11
|
#if TARGET_HOST_POSIX_X11
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -541,8 +539,6 @@ void FGAPIENTRY glutLeaveGameMode( void )
|
|||||||
|
|
||||||
freeglut_return_if_fail( fgStructure.GameModeWindow );
|
freeglut_return_if_fail( fgStructure.GameModeWindow );
|
||||||
|
|
||||||
fgStructure.GameModeWindow->State.IsGameMode = GL_FALSE;
|
|
||||||
|
|
||||||
fgAddToWindowDestroyList( fgStructure.GameModeWindow );
|
fgAddToWindowDestroyList( fgStructure.GameModeWindow );
|
||||||
fgStructure.GameModeWindow = NULL;
|
fgStructure.GameModeWindow = NULL;
|
||||||
|
|
||||||
|
@ -422,7 +422,6 @@ struct tagSFG_WindowState
|
|||||||
GLboolean IgnoreKeyRepeat; /* Whether to ignore key repeat. */
|
GLboolean IgnoreKeyRepeat; /* Whether to ignore key repeat. */
|
||||||
GLboolean KeyRepeating; /* Currently in repeat mode */
|
GLboolean KeyRepeating; /* Currently in repeat mode */
|
||||||
|
|
||||||
GLboolean IsGameMode; /* Is this the game mode window? */
|
|
||||||
GLboolean NeedToResize; /* Do we need to resize the window? */
|
GLboolean NeedToResize; /* Do we need to resize the window? */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -120,7 +120,7 @@ static void fghReshapeWindow ( SFG_Window *window, int width, int height )
|
|||||||
|
|
||||||
if ( window->Parent == NULL )
|
if ( window->Parent == NULL )
|
||||||
{
|
{
|
||||||
if ( ! window->IsMenu && !window->State.IsGameMode )
|
if ( ! window->IsMenu && (window != fgStructure.GameModeWindow) )
|
||||||
{
|
{
|
||||||
w += GetSystemMetrics( SM_CXSIZEFRAME ) * 2;
|
w += GetSystemMetrics( SM_CXSIZEFRAME ) * 2;
|
||||||
h += GetSystemMetrics( SM_CYSIZEFRAME ) * 2 +
|
h += GetSystemMetrics( SM_CYSIZEFRAME ) * 2 +
|
||||||
|
Reference in New Issue
Block a user