From c4dc34eefde8740e12bd2ed974f81841d862c878 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 1 Sep 2019 13:10:11 +0200
Subject: [PATCH] Consolidate HoverClickSounds constructors

As suggested in review, merge both HoverClickSounds constructors into
one accepting optional arguments. Due to existing usages the parameter
is added as second and supplied by name in ModButton.
---
 .../Graphics/UserInterface/HoverClickSounds.cs | 18 ++++++------------
 osu.Game/Overlays/Mods/ModButton.cs            |  2 +-
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/HoverClickSounds.cs b/osu.Game/Graphics/UserInterface/HoverClickSounds.cs
index 8fe20e3566..7e6c0a0974 100644
--- a/osu.Game/Graphics/UserInterface/HoverClickSounds.cs
+++ b/osu.Game/Graphics/UserInterface/HoverClickSounds.cs
@@ -20,24 +20,18 @@ namespace osu.Game.Graphics.UserInterface
         private SampleChannel sampleClick;
         private readonly MouseButton[] buttons;
 
-        /// <summary>
-        /// Creates an instance that adds sounds on hover and left click only.
-        /// </summary>
-        /// <param name="sampleSet">Set of click samples to play.</param>
-        public HoverClickSounds(HoverSampleSet sampleSet = HoverSampleSet.Normal)
-            : this(new[] { MouseButton.Left }, sampleSet)
-        {
-        }
-
         /// <summary>
         /// Creates an instance that adds sounds on hover and on click for any of the buttons specified.
         /// </summary>
-        /// <param name="buttons">Array of button codes which should trigger the click sound.</param>
         /// <param name="sampleSet">Set of click samples to play.</param>
-        public HoverClickSounds(MouseButton[] buttons, HoverSampleSet sampleSet = HoverSampleSet.Normal)
+        /// <param name="buttons">
+        /// 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 also be added on left click.
+        /// </param>
+        public HoverClickSounds(HoverSampleSet sampleSet = HoverSampleSet.Normal, MouseButton[] buttons = null)
             : base(sampleSet)
         {
-            this.buttons = buttons;
+            this.buttons = buttons ?? new[] { MouseButton.Left };
         }
 
         protected override bool OnMouseUp(MouseUpEvent e)
diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs
index f46555dc4b..58892cd0dd 100644
--- a/osu.Game/Overlays/Mods/ModButton.cs
+++ b/osu.Game/Overlays/Mods/ModButton.cs
@@ -283,7 +283,7 @@ namespace osu.Game.Overlays.Mods
                     Anchor = Anchor.TopCentre,
                     Font = OsuFont.GetFont(size: 18)
                 },
-                new HoverClickSounds(new[] { MouseButton.Left, MouseButton.Right })
+                new HoverClickSounds(buttons: new[] { MouseButton.Left, MouseButton.Right })
             };
 
             Mod = mod;