labeled slider event fixes

Author: pandinocoder

Intersect.Client.Framework/Gwen/Control/LabeledSlider.cs

@@ -54,11 +54,23 @@ public LabeledSlider(Base parent, string? name = default) : base(parent: parent,
             if (_rounding > -1)
             {
                 newValue = Math.Round(newValue, _rounding);
-                _slider.SetValue(newValue, skipEvents: true);
             }
 
+            if (newValue.Equals(_sliderValue.Value))
+            {
+                return;
+            }
+
+            _slider.SetValue(newValue, skipEvents: true);
             _sliderValue.SetValue(newValue, skipEvents: true);
-            ValueChanged?.Invoke(sender, arguments);
+
+            ValueChanged?.Invoke(
+                sender,
+                new ValueChangedEventArgs<double>
+                {
+                    Value = newValue,
+                }
+            );
         };
 
         _sliderValue.TextChanged += (sender, _) =>
@@ -72,11 +84,12 @@ public LabeledSlider(Base parent, string? name = default) : base(parent: parent,
 
             _slider.Value = clampedValue;
             _slider.SetValue(clampedValue, skipEvents: true);
+
             ValueChanged?.Invoke(
                 sender,
                 new ValueChangedEventArgs<double>
                 {
-                    Value = newValue,
+                    Value = clampedValue,
                 }
             );
         };

Intersect.Client.Framework/Gwen/Control/Slider.cs

@@ -405,7 +405,7 @@ protected override void Render(Skin.Base skin)
         );
     }
 
-    protected virtual void SetValueInternal(double newInternalValue, bool forceUpdate = false)
+    protected virtual void SetValueInternal(double newInternalValue, bool forceUpdate = false, bool skipEvents = false)
     {
         if (_snapToNotches)
         {
@@ -430,13 +430,16 @@ protected virtual void SetValueInternal(double newInternalValue, bool forceUpdat
         if (!_value.Equals(newInternalValue))
         {
             _value = newInternalValue;
-            ValueChanged?.Invoke(
-                this,
-                new ValueChangedEventArgs<double>
-                {
-                    Value = ScaleValueToExternal(newInternalValue),
-                }
-            );
+            if (!skipEvents)
+            {
+                ValueChanged?.Invoke(
+                    this,
+                    new ValueChangedEventArgs<double>
+                    {
+                        Value = ScaleValueToExternal(newInternalValue),
+                    }
+                );
+            }
         }
         else if (!forceUpdate)
         {
@@ -557,7 +560,7 @@ public void SetValue(double value, bool skipEvents = false)
         }
 
         var normalizedValue = (value - _minimumValue) / Math.Max(1, _maximumValue - _minimumValue);
-        SetValueInternal(normalizedValue);
+        SetValueInternal(normalizedValue, skipEvents: skipEvents);
         Redraw();
     }
 }

Intersect.Client.Framework/Gwen/Control/TextBoxNumeric.cs

@@ -8,8 +8,7 @@ namespace Intersect.Client.Framework.Gwen.Control;
 /// </summary>
 public partial class TextBoxNumeric : TextBox, INumericInput
 {
-
-    protected double _value;
+    private double _value;
 
     private double _maximum = double.NaN;
     private double _minimum = double.NaN;
@@ -158,7 +157,7 @@ public override void SetText(string? text, bool doEvents = true)
         }
     }
 
-    public virtual void SetValue(double value, bool skipEvents = false)
+    public void SetValue(double value, bool skipEvents = false)
     {
         var clampedValue = value;
 
@@ -180,7 +179,7 @@ public virtual void SetValue(double value, bool skipEvents = false)
         }
 
         _value = clampedValue;
-        Text = clampedValue.ToString(CultureInfo.CurrentCulture);
+        SetText(text: clampedValue.ToString(CultureInfo.CurrentCulture), doEvents: !skipEvents);
 
         if (skipEvents)
         {