Add hover+select sounds to some components that are missing them

osu.Game/Graphics/Containers/OsuRearrangeableListItem.cs

@@ -7,6 +7,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
+using osu.Game.Graphics.UserInterface;
 using osuTK;
 using osuTK.Graphics;
 
@@ -59,33 +60,37 @@ namespace osu.Game.Graphics.Containers
         [BackgroundDependencyLoader]
         private void load()
         {
-            InternalChild = new GridContainer
+            InternalChildren = new Drawable[]
             {
-                RelativeSizeAxes = Axes.X,
+                new GridContainer
-                AutoSizeAxes = Axes.Y,
-                Content = new[]
                 {
-                    new[]
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Content = new[]
                     {
-                        handleContainer = new Container
+                        new[]
                         {
-                            Anchor = Anchor.Centre,
+                            handleContainer = new Container
-                            Origin = Anchor.Centre,
-                            AutoSizeAxes = Axes.Both,
-                            Padding = new MarginPadding { Horizontal = 5 },
-                            Child = handle = new PlaylistItemHandle
                             {
-                                Size = new Vector2(12),
+                                Anchor = Anchor.Centre,
-                                Colour = HandleColour,
+                                Origin = Anchor.Centre,
-                                AlwaysPresent = true,
+                                AutoSizeAxes = Axes.Both,
-                                Alpha = 0
+                                Padding = new MarginPadding { Horizontal = 5 },
-                            }
+                                Child = handle = new PlaylistItemHandle
-                        },
+                                {
-                        CreateContent()
+                                    Size = new Vector2(12),
-                    }
+                                    Colour = HandleColour,
+                                    AlwaysPresent = true,
+                                    Alpha = 0
+                                }
+                            },
+                            CreateContent()
+                        }
+                    },
+                    ColumnDimensions = new[] { new Dimension(GridSizeMode.AutoSize) },
+                    RowDimensions = new[] { new Dimension(GridSizeMode.AutoSize) }
                 },
-                ColumnDimensions = new[] { new Dimension(GridSizeMode.AutoSize) },
+                new HoverClickSounds()
-                RowDimensions = new[] { new Dimension(GridSizeMode.AutoSize) }
             };
         }
 

osu.Game/Graphics/UserInterface/ExternalLinkButton.cs

@@ -23,14 +23,20 @@ namespace osu.Game.Graphics.UserInterface
         [Resolved]
         private GameHost host { get; set; }
 
+        private readonly SpriteIcon linkIcon;
+
         public ExternalLinkButton(string link = null)
         {
             Link = link;
             Size = new Vector2(12);
-            InternalChild = new SpriteIcon
+            InternalChildren = new Drawable[]
             {
-                Icon = FontAwesome.Solid.ExternalLinkAlt,
+                linkIcon = new SpriteIcon
-                RelativeSizeAxes = Axes.Both
+                {
+                    Icon = FontAwesome.Solid.ExternalLinkAlt,
+                    RelativeSizeAxes = Axes.Both
+                },
+                new HoverClickSounds(HoverSampleSet.Submit)
             };
         }
 
@@ -42,13 +48,13 @@ namespace osu.Game.Graphics.UserInterface
 
         protected override bool OnHover(HoverEvent e)
         {
-            InternalChild.FadeColour(hoverColour, 500, Easing.OutQuint);
+            linkIcon.FadeColour(hoverColour, 500, Easing.OutQuint);
             return base.OnHover(e);
         }
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
-            InternalChild.FadeColour(Color4.White, 500, Easing.OutQuint);
+            linkIcon.FadeColour(Color4.White, 500, Easing.OutQuint);
             base.OnHoverLost(e);
         }
 

osu.Game/Overlays/Chat/Tabs/ChannelTabItem.cs

@@ -3,6 +3,9 @@
 
 using System;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
+using osu.Framework.Extensions;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -13,6 +16,7 @@ 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.Online.Chat;
 using osuTK;
 using osuTK.Graphics;
@@ -39,6 +43,8 @@ namespace osu.Game.Overlays.Chat.Tabs
 
         protected override Container<Drawable> Content => content;
 
+        private Sample sampleTabSwitched;
+
         public ChannelTabItem(Channel value)
             : base(value)
         {
@@ -112,6 +118,7 @@ namespace osu.Game.Overlays.Chat.Tabs
                         },
                     },
                 },
+                new HoverSounds()
             };
         }
 
@@ -152,11 +159,12 @@ namespace osu.Game.Overlays.Chat.Tabs
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OsuColour colours, AudioManager audio)
         {
             BackgroundActive = colours.ChatBlue;
             BackgroundInactive = colours.Gray4;
             backgroundHover = colours.Gray7;
+            sampleTabSwitched = audio.Samples.Get($@"UI/{HoverSampleSet.Default.GetDescription()}-select");
 
             highlightBox.Colour = colours.Yellow;
         }
@@ -217,7 +225,14 @@ namespace osu.Game.Overlays.Chat.Tabs
             Text.Font = Text.Font.With(weight: FontWeight.Medium);
         }
 
-        protected override void OnActivated() => updateState();
+        protected override void OnActivated()
+        {
+            if (IsLoaded)
+                sampleTabSwitched?.Play();
+
+            updateState();
+        }
+
         protected override void OnDeactivated() => updateState();
     }
 }

osu.Game/Overlays/Chat/Tabs/PrivateChannelTabItem.cs

@@ -25,7 +25,7 @@ namespace osu.Game.Overlays.Chat.Tabs
             if (value.Type != ChannelType.PM)
                 throw new ArgumentException("Argument value needs to have the targettype user!");
 
-            ClickableAvatar avatar;
+            DrawableAvatar avatar;
 
             AddRange(new Drawable[]
             {
@@ -48,10 +48,9 @@ namespace osu.Game.Overlays.Chat.Tabs
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
                             Masking = true,
-                            Child = new DelayedLoadWrapper(avatar = new ClickableAvatar(value.Users.First())
+                            Child = new DelayedLoadWrapper(avatar = new DrawableAvatar(value.Users.First())
                             {
-                                RelativeSizeAxes = Axes.Both,
+                                RelativeSizeAxes = Axes.Both
-                                OpenOnClick = false,
                             })
                             {
                                 RelativeSizeAxes = Axes.Both,

osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs

@@ -138,7 +138,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                             },
                         }
                     }
-                }
+                },
+                new HoverClickSounds()
             };
 
             foreach (var b in bindings)
@@ -458,6 +459,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                         Origin = Anchor.Centre,
                         Text = keyBinding.KeyCombination.ReadableString(),
                     },
+                    new HoverSounds()
                 };
             }
 

osu.Game/Users/Drawables/UpdateableFlag.cs

@@ -5,6 +5,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays;
 
 namespace osu.Game.Users.Drawables
@@ -32,9 +33,17 @@ namespace osu.Game.Users.Drawables
             if (country == null && !ShowPlaceholderOnNull)
                 return null;
 
-            return new DrawableFlag(country)
+            return new Container
             {
                 RelativeSizeAxes = Axes.Both,
+                Children = new Drawable[]
+                {
+                    new DrawableFlag(country)
+                    {
+                        RelativeSizeAxes = Axes.Both
+                    },
+                    new HoverClickSounds(HoverSampleSet.Submit)
+                }
             };
         }