RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add global action for toggling now playing overlay (#7501) 

Add global action for toggling now playing overlay
This commit is contained in:
Dean Herbert 2020-01-13 15:53:35 +08:00 committed by GitHub
parent 8059922aa4 f43602518a
commit 7a6215c6cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Input/Bindings/GlobalActionContainer.cs
View File

@ -24,6 +24,7 @@ public GlobalActionContainer(OsuGameBase game)
public IEnumerable<KeyBinding> GlobalKeyBindings => new[]
{
new KeyBinding(InputKey.F6, GlobalAction.ToggleNowPlaying),
new KeyBinding(InputKey.F8, GlobalAction.ToggleChat),
new KeyBinding(InputKey.F9, GlobalAction.ToggleSocial),
new KeyBinding(InputKey.F10, GlobalAction.ToggleGameplayMouseButtons),
@ -137,5 +138,8 @@ public enum GlobalAction
[Description("Play / pause")]
MusicPlay,
[Description("Toggle now playing overlay")]
ToggleNowPlaying,
}
}

8
osu.Game/OsuGame.cs
View File

@ -61,6 +61,8 @@ public class OsuGame : OsuGameBase, IKeyBindingHandler<GlobalAction>
private NotificationOverlay notifications;
private NowPlayingOverlay nowPlaying;
private DirectOverlay direct;
private SocialOverlay social;
@ -624,7 +626,7 @@ protected override void LoadComplete()
Origin = Anchor.TopRight,
}, rightFloatingOverlayContent.Add, true);
loadComponentSingleFile(new NowPlayingOverlay
loadComponentSingleFile(nowPlaying = new NowPlayingOverlay
{
GetToolbarHeight = () => ToolbarOffset,
Anchor = Anchor.TopRight,
@ -822,6 +824,10 @@ public bool OnPressed(GlobalAction action)
switch (action)
{
case GlobalAction.ToggleNowPlaying:
nowPlaying.ToggleVisibility();
return true;
case GlobalAction.ToggleChat:
chatOverlay.ToggleVisibility();
return true;