From 953683044f4440051bd39f9ff294f172aa095dd0 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Fri, 18 Jun 2021 21:00:08 +0900
Subject: [PATCH] fix checkbox sounds not being used for certain checkboxes

---
 .../UserInterface/OsuTabControlCheckbox.cs    | 22 ++++++++++++++++---
 osu.Game/Overlays/Comments/CommentsHeader.cs  | 17 ++++++++++++++
 osu.Game/Overlays/Comments/HeaderButton.cs    |  2 --
 osu.Game/Overlays/OverlaySortTabControl.cs    |  2 ++
 4 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs b/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs
index b66a4a58ce..c6121dcd17 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs
@@ -4,6 +4,8 @@
 using osuTK;
 using osuTK.Graphics;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -43,6 +45,8 @@ namespace osu.Game.Graphics.UserInterface
         }
 
         private const float transition_length = 500;
+        private Sample sampleChecked;
+        private Sample sampleUnchecked;
 
         public OsuTabControlCheckbox()
         {
@@ -77,8 +81,7 @@ namespace osu.Game.Graphics.UserInterface
                     Colour = Color4.White,
                     Origin = Anchor.BottomLeft,
                     Anchor = Anchor.BottomLeft,
-                },
-                new HoverClickSounds()
+                }
             };
 
             Current.ValueChanged += selected =>
@@ -91,10 +94,13 @@ namespace osu.Game.Graphics.UserInterface
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OsuColour colours, AudioManager audio)
         {
             if (accentColour == null)
                 AccentColour = colours.Blue;
+
+            sampleChecked = audio.Samples.Get(@"UI/check-on");
+            sampleUnchecked = audio.Samples.Get(@"UI/check-off");
         }
 
         protected override bool OnHover(HoverEvent e)
@@ -111,6 +117,16 @@ namespace osu.Game.Graphics.UserInterface
             base.OnHoverLost(e);
         }
 
+        protected override void OnUserChange(bool value)
+        {
+            base.OnUserChange(value);
+
+            if (value)
+                sampleChecked?.Play();
+            else
+                sampleUnchecked?.Play();
+        }
+
         private void updateFade()
         {
             box.FadeTo(Current.Value || IsHovered ? 1 : 0, transition_length, Easing.OutQuint);
diff --git a/osu.Game/Overlays/Comments/CommentsHeader.cs b/osu.Game/Overlays/Comments/CommentsHeader.cs
index 0dd68bbd41..bf80655c3d 100644
--- a/osu.Game/Overlays/Comments/CommentsHeader.cs
+++ b/osu.Game/Overlays/Comments/CommentsHeader.cs
@@ -2,6 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics;
 using osu.Framework.Bindables;
@@ -66,6 +68,8 @@ namespace osu.Game.Overlays.Comments
             public readonly BindableBool Checked = new BindableBool();
 
             private readonly SpriteIcon checkboxIcon;
+            private Sample sampleChecked;
+            private Sample sampleUnchecked;
 
             public ShowDeletedButton()
             {
@@ -93,6 +97,13 @@ namespace osu.Game.Overlays.Comments
                 });
             }
 
+            [BackgroundDependencyLoader]
+            private void load(AudioManager audio)
+            {
+                sampleChecked = audio.Samples.Get(@"UI/check-on");
+                sampleUnchecked = audio.Samples.Get(@"UI/check-off");
+            }
+
             protected override void LoadComplete()
             {
                 Checked.BindValueChanged(isChecked => checkboxIcon.Icon = isChecked.NewValue ? FontAwesome.Solid.CheckSquare : FontAwesome.Regular.Square, true);
@@ -102,6 +113,12 @@ namespace osu.Game.Overlays.Comments
             protected override bool OnClick(ClickEvent e)
             {
                 Checked.Value = !Checked.Value;
+
+                if (Checked.Value)
+                    sampleChecked?.Play();
+                else
+                    sampleUnchecked?.Play();
+
                 return true;
             }
         }
diff --git a/osu.Game/Overlays/Comments/HeaderButton.cs b/osu.Game/Overlays/Comments/HeaderButton.cs
index fdc8db35ab..65172aa57c 100644
--- a/osu.Game/Overlays/Comments/HeaderButton.cs
+++ b/osu.Game/Overlays/Comments/HeaderButton.cs
@@ -6,7 +6,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
-using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Comments
 {
@@ -39,7 +38,6 @@ namespace osu.Game.Overlays.Comments
                     Origin = Anchor.Centre,
                     Margin = new MarginPadding { Horizontal = 10 }
                 },
-                new HoverClickSounds(),
             });
         }
 
diff --git a/osu.Game/Overlays/OverlaySortTabControl.cs b/osu.Game/Overlays/OverlaySortTabControl.cs
index b230acca11..d4dde0db3f 100644
--- a/osu.Game/Overlays/OverlaySortTabControl.cs
+++ b/osu.Game/Overlays/OverlaySortTabControl.cs
@@ -148,6 +148,8 @@ namespace osu.Game.Overlays
                         }
                     }
                 });
+
+                AddInternal(new HoverClickSounds());
             }
 
             protected override void LoadComplete()