sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-03 01:09:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Allow top-level menu key pressed to progress the osu! logo

Browse Source
This commit is contained in:
Dean Herbert
2019-09-22 20:30:58 +09:00
parent cdf29b0952
commit fc1d49631a
2 changed files with 19 additions and 3 deletions
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 readonly Key TriggerKey;
private readonly Container iconText;
private readonly Container box;
private readonly Box boxHoverLayer;
@ -43,7 +45,6 @@ namespace osu.Game.Screens.Menu
public ButtonSystemState VisibleState = ButtonSystemState.TopLevel;
private readonly Action clickAction;
private readonly Key triggerKey;
private SampleChannel sampleClick;
private SampleChannel sampleHover;
@ -53,7 +54,7 @@ namespace osu.Game.Screens.Menu
{
this.sampleName = sampleName;
this.clickAction = clickAction;
this.triggerKey = triggerKey;
TriggerKey = triggerKey;
AutoSizeAxes = Axes.Both;
Alpha = 0;
@ -210,7 +211,7 @@ namespace osu.Game.Screens.Menu
if (e.Repeat || e.ControlPressed || e.ShiftPressed || e.AltPressed)
return false;
if (triggerKey == e.Key && triggerKey != Key.Unknown)
if (TriggerKey == e.Key && TriggerKey != Key.Unknown)
{
trigger();
return true;