r4907 - trunk/data/qcsrc/menu/item

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-10-27 06:28:49 -0400 (Mon, 27 Oct 2008)
New Revision: 4907

Modified:
   trunk/data/qcsrc/menu/item/slider.c
Log:
fix behaviour of sliders when clicking to scroll page-wise. Now never goes farther than were the mouse cursor is, easier to use that way!


Modified: trunk/data/qcsrc/menu/item/slider.c
===================================================================
--- trunk/data/qcsrc/menu/item/slider.c	2008-10-27 08:20:19 UTC (rev 4906)
+++ trunk/data/qcsrc/menu/item/slider.c	2008-10-27 10:28:49 UTC (rev 4907)
@@ -88,7 +88,7 @@
 	float inRange;
 	if(me.disabled)
 		return 0;
-	inRange = (me.value == median(me.valueMin, me.value, me.valueMax));
+	inRange = (almost_in_bounds(me.valueMin, me.value, me.valueMax));
 	if(key == K_LEFTARROW)
 	{
 		if(inRange)
@@ -178,10 +178,39 @@
 	}
 	else
 	{
+		float clickValue, pageValue, inRange;
+		clickValue = median(0, (pos_x - me.pressOffset - 0.5 * me.controlWidth) / (1 - me.textSpace - me.controlWidth), 1) * (me.valueMax - me.valueMin) + me.valueMin;
+		inRange = (almost_in_bounds(me.valueMin, me.value, me.valueMax));
 		if(pos_x < controlCenter)
-			me.keyDown(me, K_PGUP, 0, 0);
+		{
+			pageValue = me.value - me.valuePageStep;
+			if(me.valueStep)
+				clickValue = floor(clickValue / me.valueStep) * me.valueStep;
+			pageValue = max(pageValue, clickValue);
+			if(inRange)
+				me.setValue(me, median(me.valueMin, pageValue, me.valueMax));
+			else
+				me.setValue(me, me.valueMax);
+		}
 		else
-			me.keyDown(me, K_PGDN, 0, 0);
+		{
+			pageValue = me.value + me.valuePageStep;
+			if(me.valueStep)
+				clickValue = ceil(clickValue / me.valueStep) * me.valueStep;
+			pageValue = min(pageValue, clickValue);
+			if(inRange)
+				me.setValue(me, median(me.valueMin, pageValue, me.valueMax));
+			else
+				me.setValue(me, me.valueMax);
+		}
+		if(pageValue == clickValue)
+		{
+			controlCenter = (me.value - me.valueMin) / (me.valueMax - me.valueMin) * (1 - me.textSpace - me.controlWidth) + 0.5 * me.controlWidth;
+			me.pressed = 1;
+			me.pressOffset = pos_x - controlCenter;
+			me.previousValue = me.value;
+			//me.mouseDrag(me, pos);
+		}
 	}
 	return 1;
 }