Fixing erroneous implementation of Takeshi\'s fix
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@583 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
parent
0a1ca74613
commit
cd7f74dca3
@ -540,13 +540,13 @@ static void fghActivateMenu( SFG_Window* window, int button )
|
|||||||
|
|
||||||
/* Set up the initial menu position now: */
|
/* Set up the initial menu position now: */
|
||||||
fghGetVMaxExtent(menu->ParentWindow, &max_x, &max_y);
|
fghGetVMaxExtent(menu->ParentWindow, &max_x, &max_y);
|
||||||
menu->X = window->State.MouseX + max_x;
|
menu->X = window->State.MouseX + glutGet( GLUT_WINDOW_X );
|
||||||
menu->Y = window->State.MouseY + max_y;
|
menu->Y = window->State.MouseY + glutGet( GLUT_WINDOW_Y );
|
||||||
|
|
||||||
if( menu->X + menu->Width > glutGet ( GLUT_SCREEN_WIDTH ) )
|
if( menu->X + menu->Width > max_x )
|
||||||
menu->X -=menu->Width;
|
menu->X -=menu->Width;
|
||||||
|
|
||||||
if( menu->Y + menu->Height > glutGet ( GLUT_SCREEN_HEIGHT ) )
|
if( menu->Y + menu->Height > max_y )
|
||||||
menu->Y -=menu->Height;
|
menu->Y -=menu->Height;
|
||||||
|
|
||||||
fgSetWindow( menu->Window );
|
fgSetWindow( menu->Window );
|
||||||
|
Reference in New Issue
Block a user