From 6369d6df7d61d6ba21403372deb78ee2a11c38bf Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Sun, 24 Apr 2022 10:28:31 +0300 Subject: Changes in GUI - slider offset text bugMarginOffsetSliderConverter. Related Work Items: #6335 --- .../Tango.Touch/TouchColorPickerControls/MultiRangeSlider.cs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'Software/Visual_Studio/Tango.Touch') diff --git a/Software/Visual_Studio/Tango.Touch/TouchColorPickerControls/MultiRangeSlider.cs b/Software/Visual_Studio/Tango.Touch/TouchColorPickerControls/MultiRangeSlider.cs index 4ee029bbb..31342159d 100644 --- a/Software/Visual_Studio/Tango.Touch/TouchColorPickerControls/MultiRangeSlider.cs +++ b/Software/Visual_Studio/Tango.Touch/TouchColorPickerControls/MultiRangeSlider.cs @@ -228,13 +228,12 @@ namespace Tango.Touch.Controls private double ValidateValue(double value) { - if (value > MinimumValue + TickFrequency && value < MaximumValue - TickFrequency) + if (value >= MinimumValue && value <= MaximumValue ) return value; - if (Math.Abs(value - MaximumValue) < TickFrequency) - return IsLast ? MaximumValue : (MaximumValue - TickFrequency); - if (Math.Abs(value - MinimumValue) < TickFrequency) - return IsFirst ? MinimumValue : (MinimumValue + TickFrequency); - + if ((value ) > MaximumValue) + return MaximumValue; + if ((value ) < MinimumValue) + return MinimumValue ; return double.NaN; } -- cgit v1.3.1