From 824bfa586c5812097a27916337c30564f180c0a6 Mon Sep 17 00:00:00 2001 From: Severin Meyer Date: Fri, 14 Nov 2014 15:04:08 +0100 Subject: [PATCH] Prevent the slider button from flickering when changing gametype --- qcsrc/menu/xonotic/slider.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/qcsrc/menu/xonotic/slider.c b/qcsrc/menu/xonotic/slider.c index 0577207ca..aba15ecae 100644 --- a/qcsrc/menu/xonotic/slider.c +++ b/qcsrc/menu/xonotic/slider.c @@ -33,20 +33,24 @@ entity makeXonoticSlider(float theValueMin, float theValueMax, float theValueSte } void XonoticSlider_configureXonoticSlider(entity me, float theValueMin, float theValueMax, float theValueStep, string theCvar) { - float v, vk, vp; - v = theValueMin; - vk = theValueStep; + float vp; vp = theValueStep * 10; while(fabs(vp) < fabs(theValueMax - theValueMin) / 40) vp *= 10; + me.configureSliderVisuals(me, me.fontSize, me.align, me.valueSpace, me.image); - me.configureSliderValues(me, theValueMin, v, theValueMax, theValueStep, vk, vp); + if(theCvar) { + // Prevent flickering of the slider button by initialising the + // slider out of bounds to hide the button before loading the cvar + me.configureSliderValues(me, theValueMin, theValueMin-theValueStep, theValueMax, theValueStep, theValueStep, vp); me.cvarName = theCvar; me.loadCvars(me); me.tooltip = getZonedTooltipForIdentifier(theCvar); } + else + me.configureSliderValues(me, theValueMin, theValueMin, theValueMax, theValueStep, theValueStep, vp); } void XonoticSlider_setValue(entity me, float val) { -- 2.39.2