Skip to content

Commit e19624c

Browse files
committed
panda's review
(tested: working as intended!) Signed-off-by: Arufonsu <17498701+Arufonsu@users.noreply.github.com>
1 parent 8cde76e commit e19624c

2 files changed

Lines changed: 16 additions & 22 deletions

File tree

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

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -380,21 +380,18 @@ protected override void OnChildSizeChanged(Base child, Point oldChildSize, Point
380380

381381
public void SetRange(double min, double max)
382382
{
383-
if (min > Maximum)
384-
{
385-
Maximum = max;
386-
Minimum = min;
387-
}
388-
else if (max < Minimum)
383+
var actualMin = Math.Min(min, max);
384+
var actualMax = Math.Max(min, max);
385+
386+
if (actualMin > Maximum)
389387
{
390-
Minimum = min;
391-
Maximum = max;
388+
Maximum = actualMax;
389+
Minimum = actualMin;
392390
}
393391
else
394392
{
395-
// Safe to set in either order
396-
Minimum = min;
397-
Maximum = max;
393+
Minimum = actualMin;
394+
Maximum = actualMax;
398395
}
399396
}
400397

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

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -458,21 +458,18 @@ protected virtual void SetValueInternal(double newInternalValue, bool forceUpdat
458458
/// <param name="max">Maximum value.</param>
459459
public void SetRange(double min, double max)
460460
{
461-
if (min > Maximum)
462-
{
463-
_maximumValue = max;
464-
_minimumValue = min;
465-
}
466-
else if (max < Minimum)
461+
var actualMin = Math.Min(min, max);
462+
var actualMax = Math.Max(min, max);
463+
464+
if (actualMin > Maximum)
467465
{
468-
_minimumValue = min;
469-
_maximumValue = max;
466+
_maximumValue = actualMax;
467+
_minimumValue = actualMin;
470468
}
471469
else
472470
{
473-
// Safe to set in either order
474-
_minimumValue = min;
475-
_maximumValue = max;
471+
_minimumValue = actualMin;
472+
_maximumValue = actualMax;
476473
}
477474
}
478475

0 commit comments

Comments
 (0)