From cf6e9f8ad8aaccba44a30f648d103ed960ffce75 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Fri, 30 May 2025 21:25:36 +0900
Subject: [PATCH] SongSelectV2: Fix some missing/incorrect SFX

---
 .../UserInterface/ShearedToggleButton.cs         |  8 ++------
 .../Graphics/UserInterfaceV2/ShearedDropdown.cs  |  2 ++
 .../SelectV2/BeatmapDetailsArea_WedgeSelector.cs | 16 +++++++++++++++-
 .../SelectV2/BeatmapMetadataWedge_TagsLine.cs    |  2 +-
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/ShearedToggleButton.cs b/osu.Game/Graphics/UserInterface/ShearedToggleButton.cs
index 05ed531d02..c2f547ba19 100644
--- a/osu.Game/Graphics/UserInterface/ShearedToggleButton.cs
+++ b/osu.Game/Graphics/UserInterface/ShearedToggleButton.cs
@@ -10,7 +10,6 @@ namespace osu.Game.Graphics.UserInterface
 {
     public partial class ShearedToggleButton : ShearedButton
     {
-        private Sample? sampleClick;
         private Sample? sampleOff;
         private Sample? sampleOn;
 
@@ -43,9 +42,8 @@ namespace osu.Game.Graphics.UserInterface
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
-            sampleClick = audio.Samples.Get(@"UI/default-select");
-            sampleOn = audio.Samples.Get(@"UI/dropdown-open");
-            sampleOff = audio.Samples.Get(@"UI/dropdown-close");
+            sampleOn = audio.Samples.Get(@"UI/check-on");
+            sampleOff = audio.Samples.Get(@"UI/check-off");
         }
 
         protected override HoverSounds CreateHoverSounds(HoverSampleSet sampleSet) => new HoverSounds(sampleSet);
@@ -72,8 +70,6 @@ namespace osu.Game.Graphics.UserInterface
 
         private void playSample()
         {
-            sampleClick?.Play();
-
             if (PlayToggleSamples)
             {
                 if (Active.Value)
diff --git a/osu.Game/Graphics/UserInterfaceV2/ShearedDropdown.cs b/osu.Game/Graphics/UserInterfaceV2/ShearedDropdown.cs
index d77b9be2da..e6385072aa 100644
--- a/osu.Game/Graphics/UserInterfaceV2/ShearedDropdown.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/ShearedDropdown.cs
@@ -34,6 +34,8 @@ namespace osu.Game.Graphics.UserInterfaceV2
                 osuHeader.Dropdown = this;
                 osuHeader.LeftSideLabel = label;
             }
+
+            AddInternal(new HoverClickSounds());
         }
 
         public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
diff --git a/osu.Game/Screens/SelectV2/BeatmapDetailsArea_WedgeSelector.cs b/osu.Game/Screens/SelectV2/BeatmapDetailsArea_WedgeSelector.cs
index 7509c3115a..8d344d8be2 100644
--- a/osu.Game/Screens/SelectV2/BeatmapDetailsArea_WedgeSelector.cs
+++ b/osu.Game/Screens/SelectV2/BeatmapDetailsArea_WedgeSelector.cs
@@ -3,12 +3,15 @@
 
 using System;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays;
 using osuTK;
 
@@ -68,6 +71,8 @@ namespace osu.Game.Screens.SelectV2
 
             protected partial class TabItem : TabItem<T>
             {
+                private Sample? selectSample;
+
                 [Resolved]
                 private OverlayColourProvider colourProvider { get; set; } = null!;
 
@@ -78,7 +83,7 @@ namespace osu.Game.Screens.SelectV2
                 {
                     AutoSizeAxes = Axes.Both;
 
-                    Children = new[]
+                    Children = new Drawable[]
                     {
                         Text = new OsuSpriteText
                         {
@@ -87,15 +92,24 @@ namespace osu.Game.Screens.SelectV2
                             Text = value.ToString(),
                             Font = OsuFont.Style.Body,
                         },
+                        new HoverSounds(HoverSampleSet.TabSelect)
                     };
                 }
 
+                [BackgroundDependencyLoader]
+                private void load(AudioManager audio)
+                {
+                    selectSample = audio.Samples.Get(@"UI/tabselect-select");
+                }
+
                 protected override void LoadComplete()
                 {
                     base.LoadComplete();
                     updateDisplay();
                 }
 
+                protected override void OnActivatedByUser() => selectSample?.Play();
+
                 protected override void OnActivated() => updateDisplay();
 
                 protected override void OnDeactivated() => updateDisplay();
diff --git a/osu.Game/Screens/SelectV2/BeatmapMetadataWedge_TagsLine.cs b/osu.Game/Screens/SelectV2/BeatmapMetadataWedge_TagsLine.cs
index 185b1ac451..bd3bb4dabb 100644
--- a/osu.Game/Screens/SelectV2/BeatmapMetadataWedge_TagsLine.cs
+++ b/osu.Game/Screens/SelectV2/BeatmapMetadataWedge_TagsLine.cs
@@ -165,7 +165,7 @@ namespace osu.Game.Screens.SelectV2
                             Colour = colourProvider.Background4,
                             Font = OsuFont.Style.Caption1.With(weight: FontWeight.Bold),
                         },
-                        new HoverClickSounds(HoverSampleSet.Button),
+                        new HoverClickSounds(),
                     };
                 }