From 5d1421c0e9b97a8d1bdbd4e422fddb6a6777dfc1 Mon Sep 17 00:00:00 2001
From: Joehu <jmadamba07@hotmail.com>
Date: Fri, 1 Jun 2018 15:31:25 -0700
Subject: [PATCH 1/3] Fix visual settings expand button colour

---
 .../Play/PlayerSettings/PlayerSettingsGroup.cs    | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/PlayerSettings/PlayerSettingsGroup.cs b/osu.Game/Screens/Play/PlayerSettings/PlayerSettingsGroup.cs
index 0ffcdf94a6..cdde11c5f8 100644
--- a/osu.Game/Screens/Play/PlayerSettings/PlayerSettingsGroup.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/PlayerSettingsGroup.cs
@@ -50,11 +50,11 @@ public bool Expanded
                     content.ResizeHeightTo(0, transition_duration, Easing.OutQuint);
                 }
 
-                button.FadeColour(expanded ? buttonActiveColour : Color4.White, 200, Easing.OutQuint);
+                button.FadeColour(expanded ? expandedColour : Color4.White, 200, Easing.OutQuint);
             }
         }
 
-        private Color4 buttonActiveColour;
+        private Color4 expandedColour;
 
         protected PlayerSettingsGroup()
         {
@@ -130,7 +130,16 @@ protected PlayerSettingsGroup()
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            button.Colour = buttonActiveColour = colours.Yellow;
+            if (expanded)
+            {
+                button.Colour = colours.Yellow;
+            }
+            else
+            {
+                button.Colour = Color4.White;
+            }
+
+            expandedColour = colours.Yellow;
         }
 
         protected override Container<Drawable> Content => content;

From 8d3de3affbba360fe7d8d755d8a71c07899dcd79 Mon Sep 17 00:00:00 2001
From: Joehu <jmadamba07@hotmail.com>
Date: Fri, 1 Jun 2018 15:58:05 -0700
Subject: [PATCH 2/3] Use '?:' expression instead

---
 .../Screens/Play/PlayerSettings/PlayerSettingsGroup.cs   | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Play/PlayerSettings/PlayerSettingsGroup.cs b/osu.Game/Screens/Play/PlayerSettings/PlayerSettingsGroup.cs
index cdde11c5f8..967cfd7fa0 100644
--- a/osu.Game/Screens/Play/PlayerSettings/PlayerSettingsGroup.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/PlayerSettingsGroup.cs
@@ -130,14 +130,7 @@ protected PlayerSettingsGroup()
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            if (expanded)
-            {
-                button.Colour = colours.Yellow;
-            }
-            else
-            {
-                button.Colour = Color4.White;
-            }
+            button.FadeColour(expanded ? colours.Yellow : Color4.White);
 
             expandedColour = colours.Yellow;
         }

From 0f13acf67e4af21539a04e7a265b1e0d0bacdbcf Mon Sep 17 00:00:00 2001
From: Joehu <jmadamba07@hotmail.com>
Date: Sat, 2 Jun 2018 12:52:31 -0700
Subject: [PATCH 3/3] Use updateExpanded method

---
 .../Screens/Play/PlayerSettings/PlayerSettingsGroup.cs    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/PlayerSettings/PlayerSettingsGroup.cs b/osu.Game/Screens/Play/PlayerSettings/PlayerSettingsGroup.cs
index 967cfd7fa0..cff3eca895 100644
--- a/osu.Game/Screens/Play/PlayerSettings/PlayerSettingsGroup.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/PlayerSettingsGroup.cs
@@ -50,7 +50,7 @@ public bool Expanded
                     content.ResizeHeightTo(0, transition_duration, Easing.OutQuint);
                 }
 
-                button.FadeColour(expanded ? expandedColour : Color4.White, 200, Easing.OutQuint);
+                updateExpanded();
             }
         }
 
@@ -130,11 +130,13 @@ protected PlayerSettingsGroup()
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            button.FadeColour(expanded ? colours.Yellow : Color4.White);
-
             expandedColour = colours.Yellow;
+
+            updateExpanded();
         }
 
+        private void updateExpanded() => button.FadeColour(expanded ? expandedColour : Color4.White, 200, Easing.InOutQuint);
+
         protected override Container<Drawable> Content => content;
 
         protected override bool OnHover(InputState state) => true;