From: terencehill <piuntn@gmail.com>
Date: Sat, 5 Sep 2015 11:32:44 +0000 (+0200)
Subject: On second thought, remove slider's handle animation while dragging: animation is... 
X-Git-Tag: xonotic-v0.8.2~1890^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e659867bfa85b0e888166555cbb5b9f2a7e53fde;p=xonotic%2Fxonotic-data.pk3dir.git

On second thought, remove slider's handle animation while dragging: animation is different for each slider and doesn't work well when slider has many values
---

diff --git a/qcsrc/menu/item/slider.qc b/qcsrc/menu/item/slider.qc
index daad34a16..72e454e27 100644
--- a/qcsrc/menu/item/slider.qc
+++ b/qcsrc/menu/item/slider.qc
@@ -55,8 +55,6 @@ void Slider_setValue_allowAnim(entity me, float val, bool allowAnim)
 {
 	if(allowAnim && me.animated) {
 		float t = 0.5;
-		if(me.pressed == 2)
-			t = 0.3; // slightly more responsive while dragging the handle
 		if(!me.sliderAnim)
 			me.sliderAnim = makeHostedEasing(me, Slider_setSliderValue, easingQuadOut, t, me.sliderValue, val);
 		else
@@ -212,7 +210,7 @@ float Slider_mouseDrag(entity me, vector pos)
 			v = median(0, (pos.x - me.pressOffset - 0.5 * me.controlWidth) / (1 - me.textSpace - me.controlWidth), 1) * (me.valueMax - me.valueMin) + me.valueMin;
 			if(me.valueStep)
 				v = floor(0.5 + v / me.valueStep) * me.valueStep;
-			me.setValue(me, v);
+			me.setValue_noAnim(me, v);
 		}
 		else
 			me.setValue(me, me.previousValue);