From 32139ac13fe90f00123d77d42b9d300afccd3746 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 1 Jul 2022 14:22:15 +0900
Subject: [PATCH] Tidy up implementation and add basic visual test

---
 .../TestSceneDifficultyRangeFilterControl.cs  | 26 ++++++++
 .../Select/DifficultyRangeFilterControl.cs    | 61 ++++++++++++++-----
 2 files changed, 71 insertions(+), 16 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/SongSelect/TestSceneDifficultyRangeFilterControl.cs

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneDifficultyRangeFilterControl.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneDifficultyRangeFilterControl.cs
new file mode 100644
index 0000000000..cc0909a835
--- /dev/null
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneDifficultyRangeFilterControl.cs
@@ -0,0 +1,26 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+#nullable disable
+using NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Game.Screens.Select;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.SongSelect
+{
+    public class TestSceneDifficultyRangeFilterControl : OsuTestScene
+    {
+        [Test]
+        public void TestBasic()
+        {
+            Child = new DifficultyRangeFilterControl
+            {
+                Width = 200,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Scale = new Vector2(3),
+            };
+        }
+    }
+}
diff --git a/osu.Game/Screens/Select/DifficultyRangeFilterControl.cs b/osu.Game/Screens/Select/DifficultyRangeFilterControl.cs
index 6148d22838..156e373b6d 100644
--- a/osu.Game/Screens/Select/DifficultyRangeFilterControl.cs
+++ b/osu.Game/Screens/Select/DifficultyRangeFilterControl.cs
@@ -7,7 +7,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.Localisation;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
@@ -15,13 +14,14 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Localisation;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Screens.Select
 {
     internal class DifficultyRangeFilterControl : CompositeDrawable
     {
-        private Bindable<double> minStars;
-        private Bindable<double> maxStars;
+        private Bindable<double> lowerStars;
+        private Bindable<double> upperStars;
 
         private StarsSlider lowerSlider;
         private MaximumStarsSlider upperSlider;
@@ -45,46 +45,75 @@ namespace osu.Game.Screens.Select
                     RelativeSizeAxes = Axes.X,
                     Y = vertical_offset,
                 },
-                lowerSlider = new StarsSlider
+                lowerSlider = new MinimumStarsSlider
                 {
                     Current = config.GetBindable<double>(OsuSetting.DisplayStarsMinimum),
                     KeyboardStep = 0.1f,
                     RelativeSizeAxes = Axes.X,
                     Y = vertical_offset,
                 },
-                lowerSlider.Nub.CreateProxy(),
                 upperSlider.Nub.CreateProxy(),
+                lowerSlider.Nub.CreateProxy(),
             };
 
-            lowerSlider.LeftBox.Height = 6;
-
-            minStars = config.GetBindable<double>(OsuSetting.DisplayStarsMinimum);
-            maxStars = config.GetBindable<double>(OsuSetting.DisplayStarsMaximum);
-
-            lowerSlider.AccentColour = lowerSlider.BackgroundColour;
+            lowerStars = config.GetBindable<double>(OsuSetting.DisplayStarsMinimum);
+            upperStars = config.GetBindable<double>(OsuSetting.DisplayStarsMaximum);
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            minStars.ValueChanged += min => maxStars.Value = Math.Max(min.NewValue, maxStars.Value);
-            maxStars.ValueChanged += max => minStars.Value = Math.Min(max.NewValue, minStars.Value);
+            lowerStars.ValueChanged += min => upperStars.Value = Math.Max(min.NewValue + 0.1, upperStars.Value);
+            upperStars.ValueChanged += max => lowerStars.Value = Math.Min(max.NewValue - 0.1, lowerStars.Value);
+        }
+
+        private class MinimumStarsSlider : StarsSlider
+        {
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                LeftBox.Height = 6; // hide any colour bleeding from overlap
+
+                AccentColour = BackgroundColour;
+                BackgroundColour = Color4.Transparent;
+            }
+
+            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
+                base.ReceivePositionalInputAt(screenSpacePos)
+                && screenSpacePos.X <= Nub.ScreenSpaceDrawQuad.TopRight.X;
+
+            public override LocalisableString TooltipText => Current.IsDefault ? UserInterfaceStrings.NoLimit : base.TooltipText;
         }
 
         private class MaximumStarsSlider : StarsSlider
         {
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                RightBox.Height = 6; // just to match the left bar height really
+            }
+
+            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
+                base.ReceivePositionalInputAt(screenSpacePos)
+                && screenSpacePos.X >= Nub.ScreenSpaceDrawQuad.TopLeft.X;
             public override LocalisableString TooltipText => Current.IsDefault ? UserInterfaceStrings.NoLimit : base.TooltipText;
         }
 
         private class StarsSlider : OsuSliderBar<double>
         {
-            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => Nub.ReceivePositionalInputAt(screenSpacePos);
-
             public override LocalisableString TooltipText => Current.Value.ToString(@"0.## stars");
 
             public new Nub Nub => base.Nub;
-            public new Box LeftBox => base.LeftBox;
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+                Nub.Width = Nub.HEIGHT;
+                RangePadding = Nub.Width / 2;
+            }
         }
     }
 }