r3251 - in trunk/data/qcsrc/menu: item nexuiz

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-01-23 17:15:02 -0500 (Wed, 23 Jan 2008)
New Revision: 3251

Modified:
   trunk/data/qcsrc/menu/item/listbox.c
   trunk/data/qcsrc/menu/nexuiz/keybinder.c
Log:
fix minor bugs in pgup/pgdn, home/end keys in menu listboxes


Modified: trunk/data/qcsrc/menu/item/listbox.c
===================================================================
--- trunk/data/qcsrc/menu/item/listbox.c	2008-01-23 20:43:07 UTC (rev 3250)
+++ trunk/data/qcsrc/menu/item/listbox.c	2008-01-23 22:15:02 UTC (rev 3251)
@@ -74,9 +74,15 @@
 	else if(key == K_DOWNARROW)
 		me.setSelected(me, me.selectedItem + 1);
 	else if(key == K_HOME)
+	{
+		me.scrollPos = 0;
 		me.setSelected(me, 0);
+	}
 	else if(key == K_END)
+	{
+		me.scrollPos = max(0, me.nItems * me.itemHeight - 1);
 		me.setSelected(me, me.nItems - 1);
+	}
 	else
 		return 0;
 	return 1;

Modified: trunk/data/qcsrc/menu/nexuiz/keybinder.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/keybinder.c	2008-01-23 20:43:07 UTC (rev 3250)
+++ trunk/data/qcsrc/menu/nexuiz/keybinder.c	2008-01-23 22:15:02 UTC (rev 3251)
@@ -209,6 +209,7 @@
 void setSelectedNexuizKeyBinder(entity me, float i)
 {
 	// handling of "unselectable" items
+	i = floor(0.5 + bound(0, i, me.nItems - 1));
 	if(me.pressed == 0 || me.pressed == 1) // keyboard or scrolling - skip unselectable items
 	{
 		if(i > me.previouslySelected)