From e5991d6e1487cd3f9a3596494fc732a0f36a5155 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Jul 2020 13:49:04 +0900
Subject: [PATCH] Change method structure for hover/unhover state setting
 (shouldn't be called "Fade")

---
 osu.Game/Graphics/UserInterface/ShowMoreButton.cs   | 13 ++++++-------
 .../Comments/Buttons/CommentRepliesButton.cs        |  4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/ShowMoreButton.cs b/osu.Game/Graphics/UserInterface/ShowMoreButton.cs
index f4ab53d305..924c7913f3 100644
--- a/osu.Game/Graphics/UserInterface/ShowMoreButton.cs
+++ b/osu.Game/Graphics/UserInterface/ShowMoreButton.cs
@@ -98,16 +98,16 @@ private void load(OverlayColourProvider colourProvider)
         protected override bool OnHover(HoverEvent e)
         {
             base.OnHover(e);
-            leftIcon.FadeHoverColour();
-            rightIcon.FadeHoverColour();
+            leftIcon.SetHoveredState(true);
+            rightIcon.SetHoveredState(true);
             return true;
         }
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
             base.OnHoverLost(e);
-            leftIcon.FadeIdleColour();
-            rightIcon.FadeIdleColour();
+            leftIcon.SetHoveredState(false);
+            rightIcon.SetHoveredState(false);
         }
 
         public class ChevronIcon : SpriteIcon
@@ -127,9 +127,8 @@ private void load()
                 Colour = colourProvider.Foreground1;
             }
 
-            public void FadeHoverColour() => this.FadeColour(colourProvider.Light1, 200, Easing.OutQuint);
-
-            public void FadeIdleColour() => this.FadeColour(colourProvider.Foreground1, 200, Easing.OutQuint);
+            public void SetHoveredState(bool hovered) =>
+                this.FadeColour(hovered ? colourProvider.Light1 : colourProvider.Foreground1, 200, Easing.OutQuint);
         }
     }
 }
diff --git a/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs b/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
index 202f3ddd7b..57bf2af4d2 100644
--- a/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
+++ b/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
@@ -96,7 +96,7 @@ protected override bool OnHover(HoverEvent e)
         {
             base.OnHover(e);
             background.FadeColour(colourProvider.Background1, 200, Easing.OutQuint);
-            icon.FadeHoverColour();
+            icon.SetHoveredState(true);
             return true;
         }
 
@@ -104,7 +104,7 @@ protected override void OnHoverLost(HoverLostEvent e)
         {
             base.OnHoverLost(e);
             background.FadeColour(colourProvider.Background2, 200, Easing.OutQuint);
-            icon.FadeIdleColour();
+            icon.SetHoveredState(false);
         }
     }
 }