h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-15 00:13:19 +08:00
Code Issues Releases Wiki Activity

Merge pull request #6210 from peppy/menu-key-support

Browse Source 
Allow top-level menu key pressed to progress the osu! logo
This commit is contained in:
Dan Balasescu 2019-09-24 15:21:34 +09:00 committed by GitHub
commit 9219aadf76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/Screens/Menu/Button.cs
View File

@ -31,6 +31,8 @@ namespace osu.Game.Screens.Menu
{ {
public event Action<ButtonState> StateChanged; public event Action<ButtonState> StateChanged;
public readonly Key TriggerKey;
private readonly Container iconText; private readonly Container iconText;
private readonly Container box; private readonly Container box;
private readonly Box boxHoverLayer; private readonly Box boxHoverLayer;
@ -43,7 +45,6 @@ namespace osu.Game.Screens.Menu
public ButtonSystemState VisibleState = ButtonSystemState.TopLevel; public ButtonSystemState VisibleState = ButtonSystemState.TopLevel;
private readonly Action clickAction; private readonly Action clickAction;
private readonly Key triggerKey;
private SampleChannel sampleClick; private SampleChannel sampleClick;
private SampleChannel sampleHover; private SampleChannel sampleHover;
@ -53,7 +54,7 @@ namespace osu.Game.Screens.Menu
{ {
this.sampleName = sampleName; this.sampleName = sampleName;
this.clickAction = clickAction; this.clickAction = clickAction;
this.triggerKey = triggerKey; TriggerKey = triggerKey;
AutoSizeAxes = Axes.Both; AutoSizeAxes = Axes.Both;
Alpha = 0; Alpha = 0;
@ -210,7 +211,7 @@ namespace osu.Game.Screens.Menu
if (e.Repeat || e.ControlPressed || e.ShiftPressed || e.AltPressed) if (e.Repeat || e.ControlPressed || e.ShiftPressed || e.AltPressed)
return false; return false;
if (triggerKey == e.Key && triggerKey != Key.Unknown) if (TriggerKey == e.Key && TriggerKey != Key.Unknown)
{ {
trigger(); trigger();
return true; return true;

15
osu.Game/Screens/Menu/ButtonSystem.cs
View File

@ -14,6 +14,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Framework.Input.Bindings; using osu.Framework.Input.Bindings;
using osu.Framework.Input.Events;
using osu.Framework.Logging; using osu.Framework.Logging;
using osu.Framework.Platform; using osu.Framework.Platform;
using osu.Framework.Threading; using osu.Framework.Threading;
@ -180,6 +181,20 @@ namespace osu.Game.Screens.Menu
State = ButtonSystemState.Initial; State = ButtonSystemState.Initial;
} }
protected override bool OnKeyDown(KeyDownEvent e)
{
if (State == ButtonSystemState.Initial)
{
if (buttonsTopLevel.Any(b => e.Key == b.TriggerKey))
{
logo?.Click();
return true;
}
}
return base.OnKeyDown(e);
}
public bool OnPressed(GlobalAction action) public bool OnPressed(GlobalAction action)
{ {
switch (action) switch (action)