X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_menu.c;h=a96f5d666d4f0c322e0f13eddbae8abf4fcf260d;hb=2d7faeb3ddee96d7454f8e1b05baefd16886cff9;hp=ec2ff456e91be735e3aeac30bf5fcf6fbe166e4a;hpb=7fdce1253e14170b6cb933f13c1f2a1644c93793;p=freeglut diff --git a/src/freeglut_menu.c b/src/freeglut_menu.c index ec2ff45..a96f5d6 100644 --- a/src/freeglut_menu.c +++ b/src/freeglut_menu.c @@ -263,9 +263,13 @@ static GLboolean fghCheckMenuStatus( SFG_Menu* menu ) menuEntry->SubMenu->X = menu->X - menuEntry->SubMenu->Width; if( menuEntry->SubMenu->Y + menuEntry->SubMenu->Height > max_y ) + { menuEntry->SubMenu->Y -= ( menuEntry->SubMenu->Height - FREEGLUT_MENU_HEIGHT - 2 * FREEGLUT_MENU_BORDER ); + if( menuEntry->SubMenu->Y < 0 ) + menuEntry->SubMenu->Y = 0; + } fgSetWindow( menuEntry->SubMenu->Window ); glutPositionWindow( menuEntry->SubMenu->X, @@ -552,7 +556,11 @@ static void fghActivateMenu( SFG_Window* window, int button ) menu->X -=menu->Width; if( menu->Y + menu->Height > max_y ) + { menu->Y -=menu->Height; + if( menu->Y < 0 ) + menu->Y = 0; + } menu->Window->State.MouseX = window->State.MouseX + glutGet( GLUT_WINDOW_X ) - menu->X;