X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_menu.c;h=5aeeeeffa67071b9cf1dfa7c9982fc50d7e3147a;hb=8e06738e2a2879e125fa166f6f7817727d898beb;hp=00e415d75ffc01e7ac84073f5f19f70b46f8c853;hpb=fe89df7de1aa6a732a441e983cce03e1fd6fd81a;p=freeglut diff --git a/src/freeglut_menu.c b/src/freeglut_menu.c index 00e415d..5aeeeef 100644 --- a/src/freeglut_menu.c +++ b/src/freeglut_menu.c @@ -193,9 +193,10 @@ static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu ) menuEntry->SubMenu->Y = menu->Y + menuEntry->Ordinal * FREEGLUT_MENU_HEIGHT ; fgSetWindow ( menuEntry->SubMenu->Window ) ; - glutShowWindow () ; glutPositionWindow ( menuEntry->SubMenu->X, menuEntry->SubMenu->Y ) ; glutReshapeWindow ( menuEntry->SubMenu->Width, menuEntry->SubMenu->Height ) ; + glutPopWindow () ; + glutShowWindow () ; menuEntry->SubMenu->Window->ActiveMenu = menuEntry->SubMenu ; fgSetWindow ( current_window ) ; } @@ -474,9 +475,10 @@ void fgActivateMenu( SFG_Window* window, int button ) menu->Y = window->State.MouseY + glutGet ( GLUT_WINDOW_Y ) ; fgSetWindow ( menu->Window ) ; - glutShowWindow () ; glutPositionWindow ( menu->X, menu->Y ) ; glutReshapeWindow ( menu->Width, menu->Height ) ; + glutPopWindow () ; + glutShowWindow () ; menu->Window->ActiveMenu = menu ; /* if( x > ( glutGet( GLUT_WINDOW_WIDTH ) - menu->Width ) )