FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

freeglut_menu.c:217,519,532: Fix menus to stay in the window (John Fay)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@216 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
sandalle 2003-10-08 19:17:07 +00:00
parent 5a3594b831
commit 65f88a4dc4
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
freeglut/freeglut/ChangeLog
View File

@ -338,3 +338,9 @@ October 24, 2002:
(111) freeglut_menu.c:328 Fix submenu triangle (John Fay) (111) freeglut_menu.c:328 Fix submenu triangle (John Fay)
*******************************************************************************************
* Changes on October 8, 2003
*******************************************************************************************
(112) freeglut_menu.c:217,519,532: Fix menus to stay in the window (John Fay)

18
freeglut/freeglut/src/freeglut_menu.c
View File

@ -215,6 +215,14 @@ static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu )
menuEntry->SubMenu->X = menu->X + menu->Width ; menuEntry->SubMenu->X = menu->X + menu->Width ;
menuEntry->SubMenu->Y = menu->Y + menuEntry->Ordinal * FREEGLUT_MENU_HEIGHT ; menuEntry->SubMenu->Y = menu->Y + menuEntry->Ordinal * FREEGLUT_MENU_HEIGHT ;
if ( menuEntry->SubMenu->X + menuEntry->SubMenu->Width > glutGet (
GLUT_SCREEN_WIDTH ) )
menuEntry->SubMenu->X = menu->X - menuEntry->SubMenu->Width ;
if ( menuEntry->SubMenu->Y + menuEntry->SubMenu->Height > glutGet (
GLUT_SCREEN_HEIGHT ) )
menuEntry->SubMenu->Y -=menuEntry->SubMenu->Height ;
fgSetWindow ( menuEntry->SubMenu->Window ) ; fgSetWindow ( menuEntry->SubMenu->Window ) ;
glutPositionWindow ( menuEntry->SubMenu->X, menuEntry->SubMenu->Y ) ; glutPositionWindow ( menuEntry->SubMenu->X, menuEntry->SubMenu->Y ) ;
glutReshapeWindow ( menuEntry->SubMenu->Width, menuEntry->SubMenu->Height ) ; glutReshapeWindow ( menuEntry->SubMenu->Width, menuEntry->SubMenu->Height ) ;
@ -513,6 +521,12 @@ void fgActivateMenu( SFG_Window* window, int button )
menu->X = window->State.MouseX + glutGet ( GLUT_WINDOW_X ) ; menu->X = window->State.MouseX + glutGet ( GLUT_WINDOW_X ) ;
menu->Y = window->State.MouseY + glutGet ( GLUT_WINDOW_Y ) ; menu->Y = window->State.MouseY + glutGet ( GLUT_WINDOW_Y ) ;
if ( menu->X + menu->Width > glutGet ( GLUT_SCREEN_WIDTH ) )
menu->X -=menu->Width ;
if ( menu->Y + menu->Height > glutGet ( GLUT_SCREEN_HEIGHT ) )
menu->Y -=menu->Height ;
fgSetWindow ( menu->Window ) ; fgSetWindow ( menu->Window ) ;
glutPositionWindow ( menu->X, menu->Y ) ; glutPositionWindow ( menu->X, menu->Y ) ;
glutReshapeWindow ( menu->Width, menu->Height ) ; glutReshapeWindow ( menu->Width, menu->Height ) ;
@ -520,10 +534,6 @@ void fgActivateMenu( SFG_Window* window, int button )
glutShowWindow () ; glutShowWindow () ;
menu->Window->ActiveMenu = menu ; menu->Window->ActiveMenu = menu ;
/* if( x > ( glutGet( GLUT_WINDOW_WIDTH ) - menu->Width ) )
menu->X = glutGet( GLUT_WINDOW_WIDTH ) - menu->Width;
if( y > ( glutGet( GLUT_WINDOW_HEIGHT ) - menu->Height) )
menu->Y = glutGet( GLUT_WINDOW_HEIGHT ) - menu->Height; */
} }
/* /*