From: terencehill <piuntn@gmail.com>
Date: Thu, 23 Jul 2015 14:04:21 +0000 (+0200)
Subject: Highlight item under the cursor even while scrolling; also remove highlighting from... 
X-Git-Tag: xonotic-v0.8.1~11^2~17
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e74e104c6753fe8b7513a1c5ff75ac0d5d9ec3e3;p=xonotic%2Fxonotic-data.pk3dir.git

Highlight item under the cursor even while scrolling; also remove highlighting from the focused item when the cursor is moved to the scrollbar area
---

diff --git a/qcsrc/menu/item/listbox.qc b/qcsrc/menu/item/listbox.qc
index 4ad3ea13d..5f2e03b24 100644
--- a/qcsrc/menu/item/listbox.qc
+++ b/qcsrc/menu/item/listbox.qc
@@ -14,6 +14,7 @@ CLASS(ListBox, Item)
 	ATTRIB(ListBox, focusable, float, 1)
 	ATTRIB(ListBox, focusedItem, int, -1)
 	ATTRIB(ListBox, focusedItemAlpha, float, 0.3)
+	ATTRIB(ListBox, focusedItemPos, vector, '0 0 0')
 	ATTRIB(ListBox, allowFocusSound, float, 1)
 	ATTRIB(ListBox, selectedItem, int, 0)
 	ATTRIB(ListBox, size, vector, '0 0 0')
@@ -193,16 +194,17 @@ float ListBox_keyDown(entity me, float key, float ascii, float shift)
 }
 float ListBox_mouseMove(entity me, vector pos)
 {
+	float focusedItem_save = me.focusedItem;
+	me.focusedItem = -1;
 	if(pos_x < 0) return 0;
 	if(pos_y < 0) return 0;
 	if(pos_x >= 1) return 0;
 	if(pos_y >= 1) return 0;
 	if(pos_x < 1 - me.controlWidth)
 	{
-		float x;
-		x = me.focusedItem;
 		me.focusedItem = me.getItemAtPos(me, me.scrollPos + pos.y);
-		if(x != me.focusedItem)
+		me.focusedItemPos = eY * pos.y;
+		if(focusedItem_save != me.focusedItem)
 			me.focusedItemAlpha = SKINALPHA_LISTBOX_FOCUSED;
 	}
 	return 1;
@@ -233,6 +235,7 @@ float ListBox_mouseDrag(entity me, vector pos)
 	}
 	else if(me.pressed == 2)
 	{
+		me.focusedItem = -1;
 		me.setSelected(me, me.getItemAtPos(me, me.scrollPos + pos.y));
 	}
 	return 1;
@@ -360,6 +363,10 @@ void ListBox_draw(entity me)
 		// this formula is guaranted to work with whatever framerate
 		float f = sin(PI / 2 * pow(frametime, 0.65));
 		me.scrollPos = me.scrollPos * (1 - f) + me.scrollPosTarget * f;
+
+		// update focusedItem while scrolling
+		if(me.focusedItem >= 0)
+			me.mouseMove(me, me.focusedItemPos);
 	}
 
 	if(me.pressed == 2)