From: terencehill <piuntn@gmail.com>
Date: Thu, 13 Aug 2015 12:53:33 +0000 (+0200)
Subject: Fix sliders handle getting stuck in the initial position when dragging outside the... 
X-Git-Tag: xonotic-v0.8.2~1890^2~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=68eb14ef597f18c91f0db495e27fdd4ae9242e2f;p=xonotic%2Fxonotic-data.pk3dir.git

Fix sliders handle getting stuck in the initial position when dragging outside the handle
---

diff --git a/qcsrc/menu/item/slider.qc b/qcsrc/menu/item/slider.qc
index e944a96ae..1d9cb8e72 100644
--- a/qcsrc/menu/item/slider.qc
+++ b/qcsrc/menu/item/slider.qc
@@ -181,10 +181,6 @@ float Slider_mouseDrag(entity me, vector pos)
 	if(me.disabled)
 		return 0;
 
-	anim.removeObjAnim(anim, me);
-	animed = me.animated;
-	me.animated = false;
-
 	if(me.pressed)
 	{
 		hit = 1;
@@ -194,17 +190,21 @@ float Slider_mouseDrag(entity me, vector pos)
 		if(pos.y >= 1 + me.tolerance.y) hit = 0;
 		if(hit)
 		{
+			anim.removeObjAnim(anim, me);
+			animed = me.animated;
+			me.animated = false;
+
 			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.animated = animed;
 		}
 		else
 			me.setValue(me, me.previousValue);
 	}
 
-	me.animated = animed;
-
 	return 1;
 }
 float Slider_mousePress(entity me, vector pos)