From: <fa...@us...> - 2007-09-18 03:22:08
|
Revision: 719 http://freeglut.svn.sourceforge.net/freeglut/?rev=719&view=rev Author: fayjf Date: 2007-09-17 20:22:11 -0700 (Mon, 17 Sep 2007) Log Message: ----------- Adding Takeshi Nishimura's Feature Request "[ 1045202 ] Cope with a menu with many items" -- sorry it took so long. Modified Paths: -------------- trunk/freeglut/freeglut/src/freeglut_menu.c Modified: trunk/freeglut/freeglut/src/freeglut_menu.c =================================================================== --- trunk/freeglut/freeglut/src/freeglut_menu.c 2007-09-18 02:32:53 UTC (rev 718) +++ trunk/freeglut/freeglut/src/freeglut_menu.c 2007-09-18 03:22:11 UTC (rev 719) @@ -263,9 +263,13 @@ 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 @@ 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; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |