From 72fa50f944c15b40adfe17435b17ec08809b46a1 Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Tue, 30 May 2017 17:02:04 +0900
Subject: [PATCH] Make replay settings match design colours.

---
 .../Tests/TestCaseReplaySettingsOverlay.cs    |  2 +-
 .../Play/ReplaySettings/DiscussionSettings.cs |  2 +-
 .../Play/ReplaySettings/PlaybackSettings.cs   |  5 +--
 .../ReplaySettings/ReplaySettingsCheckbox.cs  | 20 +++++++++++
 .../ReplaySettings/ReplaySettingsSliderBar.cs | 35 +++++++++++++++++++
 osu.Game/osu.Game.csproj                      |  2 ++
 6 files changed, 62 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game/Screens/Play/ReplaySettings/ReplaySettingsCheckbox.cs
 create mode 100644 osu.Game/Screens/Play/ReplaySettings/ReplaySettingsSliderBar.cs

diff --git a/osu.Desktop.VisualTests/Tests/TestCaseReplaySettingsOverlay.cs b/osu.Desktop.VisualTests/Tests/TestCaseReplaySettingsOverlay.cs
index 81a1633763..d88caded90 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseReplaySettingsOverlay.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseReplaySettingsOverlay.cs
@@ -33,7 +33,7 @@ public override void Reset()
                 Text = @"Button",
             }));
 
-            AddStep(@"Add checkbox", () => container.Add(new SettingsCheckbox
+            AddStep(@"Add checkbox", () => container.Add(new ReplaySettingsCheckbox
             {
                 LabelText = "Checkbox",
             }));
diff --git a/osu.Game/Screens/Play/ReplaySettings/DiscussionSettings.cs b/osu.Game/Screens/Play/ReplaySettings/DiscussionSettings.cs
index 153e8b05f9..9fc672a41e 100644
--- a/osu.Game/Screens/Play/ReplaySettings/DiscussionSettings.cs
+++ b/osu.Game/Screens/Play/ReplaySettings/DiscussionSettings.cs
@@ -18,7 +18,7 @@ private void load(OsuConfigManager config)
         {
             Children = new Drawable[]
             {
-                new SettingsCheckbox
+                new ReplaySettingsCheckbox
                 {
                     LabelText = "Show floating coments",
                     Bindable = config.GetBindable<bool>(OsuSetting.FloatingComments)
diff --git a/osu.Game/Screens/Play/ReplaySettings/PlaybackSettings.cs b/osu.Game/Screens/Play/ReplaySettings/PlaybackSettings.cs
index 2067645ef0..3cf669554d 100644
--- a/osu.Game/Screens/Play/ReplaySettings/PlaybackSettings.cs
+++ b/osu.Game/Screens/Play/ReplaySettings/PlaybackSettings.cs
@@ -6,6 +6,7 @@
 using osu.Game.Overlays.Settings;
 using osu.Game.Graphics.UserInterface;
 using osu.Framework.Graphics;
+using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Screens.Play.ReplaySettings
 {
@@ -18,10 +19,10 @@ private void load(OsuConfigManager config)
         {
             Children = new Drawable[]
             {
-                new SettingsSlider<double>
+                new ReplaySettingsSliderBar<double>()
                 {
                     LabelText = "Playback speed",
-                    Bindable = config.GetBindable<double>(OsuSetting.PlaybackSpeed),
+                    Bindable = config.GetBindable<double>(OsuSetting.PlaybackSpeed)
                 }
             };
         }
diff --git a/osu.Game/Screens/Play/ReplaySettings/ReplaySettingsCheckbox.cs b/osu.Game/Screens/Play/ReplaySettings/ReplaySettingsCheckbox.cs
new file mode 100644
index 0000000000..c3a55a668b
--- /dev/null
+++ b/osu.Game/Screens/Play/ReplaySettings/ReplaySettingsCheckbox.cs
@@ -0,0 +1,20 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Screens.Play.ReplaySettings
+{
+    public class ReplaySettingsCheckbox : OsuCheckbox
+    {
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            Nub.AccentColour = colours.Yellow;
+            Nub.GlowingAccentColour = colours.YellowLighter;
+            Nub.GlowColour = colours.YellowDarker;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/ReplaySettings/ReplaySettingsSliderBar.cs b/osu.Game/Screens/Play/ReplaySettings/ReplaySettingsSliderBar.cs
new file mode 100644
index 0000000000..5c60b9a0d5
--- /dev/null
+++ b/osu.Game/Screens/Play/ReplaySettings/ReplaySettingsSliderBar.cs
@@ -0,0 +1,35 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Game.Graphics.UserInterface;
+using System;
+using osu.Game.Graphics;
+using osu.Framework.Graphics;
+using osu.Framework.Input;
+using osu.Game.Overlays.Settings;
+
+namespace osu.Game.Screens.Play.ReplaySettings
+{
+    public class ReplaySettingsSliderBar<T> : SettingsSlider<T>
+        where T : struct, IEquatable<T>
+    {
+        protected override Drawable CreateControl() => new Sliderbar()
+        {
+            Margin = new MarginPadding { Top = 5, Bottom = 5 },
+            RelativeSizeAxes = Axes.X
+        };
+
+        private class Sliderbar : OsuSliderBar<T>
+        {
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                AccentColour = colours.Yellow;
+                Nub.AccentColour = colours.Yellow;
+                Nub.GlowingAccentColour = colours.YellowLighter;
+                Nub.GlowColour = colours.YellowDarker;
+            }
+        }
+    }
+}
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index e0db101f45..3e7741e964 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -245,7 +245,9 @@
     <Compile Include="Screens\Play\ReplaySettings\DiscussionSettings.cs" />
     <Compile Include="Graphics\UserInterface\SettingsDropdownContainer.cs" />
     <Compile Include="Screens\Play\ReplaySettings\ReplaySettingsOverlay.cs" />
+    <Compile Include="Screens\Play\ReplaySettings\ReplaySettingsSliderBar.cs" />
     <Compile Include="Screens\Play\ReplaySettings\PlaybackSettings.cs" />
+    <Compile Include="Screens\Play\ReplaySettings\ReplaySettingsCheckbox.cs" />
     <Compile Include="Screens\Play\PauseContainer.cs" />
     <Compile Include="Screens\Play\SongProgressInfo.cs" />
     <Compile Include="Screens\Play\HUD\ModDisplay.cs" />