From 0b95d07390c95fc6242b53592b854d91373cbd07 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Fri, 11 Jun 2021 20:42:10 +0900
Subject: [PATCH] Change 'default' hover/click samples into 'button' samples
 and make 'soft' the new 'default'

---
 osu.Game/Graphics/Containers/OsuClickableContainer.cs | 2 +-
 osu.Game/Graphics/UserInterface/HoverClickSounds.cs   | 2 +-
 osu.Game/Graphics/UserInterface/HoverSounds.cs        | 6 +++---
 osu.Game/Graphics/UserInterface/OsuAnimatedButton.cs  | 1 +
 osu.Game/Graphics/UserInterface/OsuButton.cs          | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Graphics/Containers/OsuClickableContainer.cs b/osu.Game/Graphics/Containers/OsuClickableContainer.cs
index 1f31e4cdda..60ded8952d 100644
--- a/osu.Game/Graphics/Containers/OsuClickableContainer.cs
+++ b/osu.Game/Graphics/Containers/OsuClickableContainer.cs
@@ -19,7 +19,7 @@ public class OsuClickableContainer : ClickableContainer, IHasTooltip
 
         protected virtual HoverClickSounds CreateHoverClickSounds(HoverSampleSet sampleSet) => new HoverClickSounds(sampleSet);
 
-        public OsuClickableContainer(HoverSampleSet sampleSet = HoverSampleSet.Normal)
+        public OsuClickableContainer(HoverSampleSet sampleSet = HoverSampleSet.Default)
         {
             this.sampleSet = sampleSet;
         }
diff --git a/osu.Game/Graphics/UserInterface/HoverClickSounds.cs b/osu.Game/Graphics/UserInterface/HoverClickSounds.cs
index 61e0266372..3273482162 100644
--- a/osu.Game/Graphics/UserInterface/HoverClickSounds.cs
+++ b/osu.Game/Graphics/UserInterface/HoverClickSounds.cs
@@ -28,7 +28,7 @@ public class HoverClickSounds : HoverSounds
         /// Array of button codes which should trigger the click sound.
         /// If this optional parameter is omitted or set to <code>null</code>, the click sound will only be played on left click.
         /// </param>
-        public HoverClickSounds(HoverSampleSet sampleSet = HoverSampleSet.Normal, MouseButton[] buttons = null)
+        public HoverClickSounds(HoverSampleSet sampleSet = HoverSampleSet.Default, MouseButton[] buttons = null)
             : base(sampleSet)
         {
             this.buttons = buttons ?? new[] { MouseButton.Left };
diff --git a/osu.Game/Graphics/UserInterface/HoverSounds.cs b/osu.Game/Graphics/UserInterface/HoverSounds.cs
index e17128ff83..ea81ef7d14 100644
--- a/osu.Game/Graphics/UserInterface/HoverSounds.cs
+++ b/osu.Game/Graphics/UserInterface/HoverSounds.cs
@@ -22,7 +22,7 @@ public class HoverSounds : HoverSampleDebounceComponent
 
         protected readonly HoverSampleSet SampleSet;
 
-        public HoverSounds(HoverSampleSet sampleSet = HoverSampleSet.Normal)
+        public HoverSounds(HoverSampleSet sampleSet = HoverSampleSet.Default)
         {
             SampleSet = sampleSet;
             RelativeSizeAxes = Axes.Both;
@@ -46,8 +46,8 @@ public enum HoverSampleSet
         [Description("default")]
         Default,
 
-        [Description("soft")]
-        Normal,
+        [Description("button")]
+        Button,
 
         [Description("softer")]
         Soft,
diff --git a/osu.Game/Graphics/UserInterface/OsuAnimatedButton.cs b/osu.Game/Graphics/UserInterface/OsuAnimatedButton.cs
index cfcf034d1c..70a107ca04 100644
--- a/osu.Game/Graphics/UserInterface/OsuAnimatedButton.cs
+++ b/osu.Game/Graphics/UserInterface/OsuAnimatedButton.cs
@@ -44,6 +44,7 @@ protected Color4 HoverColour
         private readonly Box hover;
 
         public OsuAnimatedButton()
+            : base(HoverSampleSet.Button)
         {
             base.Content.Add(content = new Container
             {
diff --git a/osu.Game/Graphics/UserInterface/OsuButton.cs b/osu.Game/Graphics/UserInterface/OsuButton.cs
index 1bd193e247..cd9ca9f87f 100644
--- a/osu.Game/Graphics/UserInterface/OsuButton.cs
+++ b/osu.Game/Graphics/UserInterface/OsuButton.cs
@@ -49,7 +49,7 @@ public Color4 BackgroundColour
         protected Box Background;
         protected SpriteText SpriteText;
 
-        public OsuButton(HoverSampleSet? hoverSounds = HoverSampleSet.Default)
+        public OsuButton(HoverSampleSet? hoverSounds = HoverSampleSet.Button)
         {
             Height = 40;