X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fitem%2Fslider.c;h=8861357b7700590438a82362ea8a7ece71a7a1fb;hb=129ac6d2e1c51e90e97c96085858bc586fb7ec24;hp=c8bab9bf80cda0314036564df6633b276d4da7d7;hpb=fb839150d0cd4c4937d183b723b6cc1ed250c66a;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/item/slider.c b/qcsrc/menu/item/slider.c
index c8bab9bf8..8861357b7 100644
--- a/qcsrc/menu/item/slider.c
+++ b/qcsrc/menu/item/slider.c
@@ -10,6 +10,7 @@ CLASS(Slider) EXTENDS(Label)
 	METHOD(Slider, mousePress, float(entity, vector))
 	METHOD(Slider, mouseDrag, float(entity, vector))
 	METHOD(Slider, mouseRelease, float(entity, vector))
+	METHOD(Slider, focusEnter, void(entity))
 	METHOD(Slider, valueToText, string(entity, float))
 	METHOD(Slider, toString, string(entity))
 	METHOD(Slider, setValue, void(entity, float))
@@ -47,7 +48,6 @@ ENDCLASS(Slider)
 void Slider_setValue(entity me, float val)
 {
 	if (me.animated) {
-		anim.stopObjAnim(anim, me);
 		anim.removeObjAnim(anim, me);
 		makeHostedEasing(me, Slider_setSliderValue, easingQuadInOut, 1, me.sliderValue, val);
 	} else {
@@ -61,7 +61,7 @@ void Slider_setSliderValue(entity me, float val)
 }
 string Slider_toString(entity me)
 {
-	return strcat(ftos(me.value), " (", me.valueToText(me, me.value), ")");
+	return sprintf(_("%d (%s)"), me.value, me.valueToText(me, me.value));
 }
 void Slider_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 {
@@ -156,7 +156,7 @@ float Slider_mouseDrag(entity me, vector pos)
 	if(me.disabled)
 		return 0;
 
-	anim.finishObjAnim(anim, me);
+	anim.removeObjAnim(anim, me);
 	animed = me.animated;
 	me.animated = false;
 
@@ -235,8 +235,6 @@ float Slider_mousePress(entity me, vector pos)
 			//me.mouseDrag(me, pos);
 		}
 	}
-	if(cvar("menu_sounds"))
-		localsound("sound/misc/menu2.wav");
 	return 1;
 }
 float Slider_mouseRelease(entity me, vector pos)
@@ -244,12 +242,20 @@ float Slider_mouseRelease(entity me, vector pos)
 	me.pressed = 0;
 	if(me.disabled)
 		return 0;
+	if(cvar("menu_sounds"))
+		localsound("sound/misc/menu2.wav");
 	return 1;
 }
 void Slider_showNotify(entity me)
 {
 	me.focusable = !me.disabled;
 }
+void Slider_focusEnter(entity me)
+{
+	if(cvar("menu_sounds") > 1)
+		localsound("sound/misc/menu1.wav");
+	SUPER(Slider).focusEnter(me);
+}
 void Slider_draw(entity me)
 {
 	float controlLeft;