add support for nonlinear float sliders, color picker range slider is now nonlinear for finer control

Author: johncosfm

engine/Sandbox.Tools/ControlWidget/FloatControlWidget.cs

@@ -11,6 +11,10 @@ public class FloatControlWidget : StringControlWidget
 	public string Icon { get; set; }
 	public string Label { get; set; }
 	public Action<Rect, float> SliderPaint { get; set; }
+	public float SliderCurve {
+		get => SliderWidget?.Curve ?? 1f;
+		set => SliderWidget?.Curve = value;
+	}
 
 	/// <summary>
 	/// If true we can draw a slider
@@ -277,6 +281,7 @@ public class FloatSlider : Widget
 {
 	public float Minimum { get; set; }
 	public float Maximum { get; set; }
+	public float Curve { get; set; } = 1f;
 	public Action OnValueEdited { get; set; }
 	public Color HighlightColor { get; set; } = Theme.TextLight;
 	public Action<Rect, float> SliderPaint { get; set; }
@@ -304,12 +309,23 @@ public float DeltaValue
 	{
 		get
 		{
-			return MathX.LerpInverse( Value, Minimum, Maximum, true );
+			var v = Value;
+			if ( Curve != 1 )
+			{
+				var range = Maximum - Minimum;
+				v = MathF.Pow( v / range, 1f / Curve ) * range;
+			}
+			return MathX.LerpInverse( v, Minimum, Maximum, true );
 		}
 
 		set
 		{
 			var v = MathX.LerpTo( Minimum, Maximum, value, true );
+			if ( Curve != 1 )
+			{
+				var range = Maximum - Minimum;
+				v = MathF.Pow( v / range, Curve ) * range;
+			}
 			Value = v;
 		}
 

game/addons/tools/Code/Widgets/ColorPicker/ColorPicker.cs

@@ -150,7 +150,7 @@ public Color ValueWithoutRange
 
 		var hueSlider = new HsvFloatControlWidget( so.GetProperty( nameof( Hue ) ), HueSliderPaint );
 		AlphaSlider = new HsvFloatControlWidget( so.GetProperty( nameof( Alpha ) ), AlphaSliderPaint );
-		RangeSlider = new HsvFloatControlWidget( so.GetProperty( nameof( Range ) ), RangeSliderPaint );
+		RangeSlider = new HsvFloatControlWidget( so.GetProperty( nameof( Range ) ), RangeSliderPaint, 3 );
 
 		so.OnPropertyStartEdit += ( p ) => EditingStarted?.Invoke();
 		so.OnPropertyFinishEdit += ( p ) => EditingFinished?.Invoke();
@@ -382,10 +382,11 @@ class HsvFloatControlWidget : FloatControlWidget
 	public override bool IncludeLabel => false;
 	public override bool IsWideMode => true;
 
-	public HsvFloatControlWidget( SerializedProperty property, Action<Rect, float> sliderPaint ) : base( property )
+	public HsvFloatControlWidget( SerializedProperty property, Action<Rect, float> sliderPaint, float curve = 1f ) : base( property )
 	{
 		Label = null;
 		Icon = "multiple_stop";
 		SliderPaint = sliderPaint;
+		SliderCurve = curve;
 	}
 }