Handle overlay toggling with toolbar buttons instead

osu.Game/OsuGame.cs

@@ -67,8 +67,6 @@ namespace osu.Game
         [NotNull]
         private readonly NotificationOverlay notifications = new NotificationOverlay();
 
-        private NowPlayingOverlay nowPlaying;
-
         private BeatmapListingOverlay beatmapListing;
 
         private DashboardOverlay dashboard;
@@ -650,7 +648,7 @@ namespace osu.Game
                 Origin = Anchor.TopRight,
             }, rightFloatingOverlayContent.Add, true);
 
-            loadComponentSingleFile(nowPlaying = new NowPlayingOverlay
+            loadComponentSingleFile(new NowPlayingOverlay
             {
                 GetToolbarHeight = () => ToolbarOffset,
                 Anchor = Anchor.TopRight,
@@ -862,18 +860,6 @@ namespace osu.Game
 
             switch (action)
             {
-                case GlobalAction.ToggleNowPlaying:
-                    nowPlaying.ToggleVisibility();
-                    return true;
-
-                case GlobalAction.ToggleChat:
-                    chatOverlay.ToggleVisibility();
-                    return true;
-
-                case GlobalAction.ToggleSocial:
-                    dashboard.ToggleVisibility();
-                    return true;
-
                 case GlobalAction.ResetInputSettings:
                     var sensitivity = frameworkConfig.GetBindable<double>(FrameworkSetting.CursorSensitivity);
 
@@ -889,18 +875,6 @@ namespace osu.Game
                     Toolbar.ToggleVisibility();
                     return true;
 
-                case GlobalAction.ToggleSettings:
-                    Settings.ToggleVisibility();
-                    return true;
-
-                case GlobalAction.ToggleDirect:
-                    beatmapListing.ToggleVisibility();
-                    return true;
-
-                case GlobalAction.ToggleNotifications:
-                    notifications.ToggleVisibility();
-                    return true;
-
                 case GlobalAction.ToggleGameplayMouseButtons:
                     LocalConfig.Set(OsuSetting.MouseDisableButtons, !LocalConfig.Get<bool>(OsuSetting.MouseDisableButtons));
                     return true;

osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs

@@ -3,6 +3,7 @@
 
 using osu.Framework.Allocation;
 using osu.Game.Graphics;
+using osu.Game.Input.Bindings;
 
 namespace osu.Game.Overlays.Toolbar
 {
@@ -13,6 +14,8 @@ namespace osu.Game.Overlays.Toolbar
             SetIcon(OsuIcon.ChevronDownCircle);
             TooltipMain = "Beatmap listing";
             TooltipSub = "Browse for new beatmaps";
+
+            Hotkey = GlobalAction.ToggleDirect;
         }
 
         [BackgroundDependencyLoader(true)]

osu.Game/Overlays/Toolbar/ToolbarButton.cs

@@ -5,23 +5,27 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;
+using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Input.Bindings;
 using osuTK;
 using osuTK.Graphics;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Input.Events;
-using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Toolbar
 {
-    public abstract class ToolbarButton : OsuClickableContainer
+    public abstract class ToolbarButton : OsuClickableContainer, IKeyBindingHandler<GlobalAction>
     {
         public const float WIDTH = Toolbar.HEIGHT * 1.4f;
 
+        protected GlobalAction? Hotkey { get; set; }
+
         public void SetIcon(Drawable icon)
         {
             IconContainer.Icon = icon;
@@ -164,6 +168,21 @@ namespace osu.Game.Overlays.Toolbar
             HoverBackground.FadeOut(200);
             tooltipContainer.FadeOut(100);
         }
+
+        public bool OnPressed(GlobalAction action)
+        {
+            if (action == Hotkey)
+            {
+                Click();
+                return true;
+            }
+
+            return false;
+        }
+
+        public void OnReleased(GlobalAction action)
+        {
+        }
     }
 
     public class OpaqueBackground : Container

osu.Game/Overlays/Toolbar/ToolbarChatButton.cs

@@ -3,6 +3,7 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Input.Bindings;
 
 namespace osu.Game.Overlays.Toolbar
 {
@@ -13,6 +14,8 @@ namespace osu.Game.Overlays.Toolbar
             SetIcon(FontAwesome.Solid.Comments);
             TooltipMain = "Chat";
             TooltipSub = "Join the real-time discussion";
+
+            Hotkey = GlobalAction.ToggleChat;
         }
 
         [BackgroundDependencyLoader(true)]

osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs

@@ -2,33 +2,19 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Input.Bindings;
 using osu.Game.Input.Bindings;
 
 namespace osu.Game.Overlays.Toolbar
 {
-    public class ToolbarHomeButton : ToolbarButton, IKeyBindingHandler<GlobalAction>
+    public class ToolbarHomeButton : ToolbarButton
     {
         public ToolbarHomeButton()
         {
             Icon = FontAwesome.Solid.Home;
             TooltipMain = "Home";
             TooltipSub = "Return to the main menu";
-        }
 
-        public bool OnPressed(GlobalAction action)
+            Hotkey = GlobalAction.Home;
-        {
-            if (action == GlobalAction.Home)
-            {
-                Click();
-                return true;
-            }
-
-            return false;
-        }
-
-        public void OnReleased(GlobalAction action)
-        {
         }
     }
 }

osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs

@@ -3,6 +3,7 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Input.Bindings;
 
 namespace osu.Game.Overlays.Toolbar
 {
@@ -13,6 +14,8 @@ namespace osu.Game.Overlays.Toolbar
             Icon = FontAwesome.Solid.Music;
             TooltipMain = "Now playing";
             TooltipSub = "Manage the currently playing track";
+
+            Hotkey = GlobalAction.ToggleNowPlaying;
         }
 
         [BackgroundDependencyLoader(true)]

osu.Game/Overlays/Toolbar/ToolbarNotificationButton.cs

@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Input.Bindings;
 using osuTK;
 using osuTK.Graphics;
 
@@ -28,6 +29,8 @@ namespace osu.Game.Overlays.Toolbar
             TooltipMain = "Notifications";
             TooltipSub = "Waiting for 'ya";
 
+            Hotkey = GlobalAction.ToggleNotifications;
+
             Add(countDisplay = new CountCircle
             {
                 Alpha = 0,

osu.Game/Overlays/Toolbar/ToolbarSettingsButton.cs

@@ -3,6 +3,7 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Input.Bindings;
 
 namespace osu.Game.Overlays.Toolbar
 {
@@ -13,6 +14,8 @@ namespace osu.Game.Overlays.Toolbar
             Icon = FontAwesome.Solid.Cog;
             TooltipMain = "Settings";
             TooltipSub = "Change your settings";
+
+            Hotkey = GlobalAction.ToggleSettings;
         }
 
         [BackgroundDependencyLoader(true)]

osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs

@@ -3,6 +3,7 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Input.Bindings;
 
 namespace osu.Game.Overlays.Toolbar
 {
@@ -13,6 +14,8 @@ namespace osu.Game.Overlays.Toolbar
             Icon = FontAwesome.Solid.Users;
             TooltipMain = "Friends";
             TooltipSub = "Interact with those close to you";
+
+            Hotkey = GlobalAction.ToggleSocial;
         }
 
         [BackgroundDependencyLoader(true)]