h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-30 14:10:32 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into respect-showoverlay-bindable

Browse Source
This commit is contained in:
Dean Herbert
2018-05-22 19:00:42 +09:00
committed by GitHub
Unverified
parent cee8d21542 52230d6279
commit ef40ca8805
8 changed files with 353 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Screens/Menu/ButtonSystem.cs
+18 -11
View File
@@ -154,6 +154,8 @@ namespace osu.Game.Screens.Menu
case Key.Space:
logo?.TriggerOnClick(state);
return true;
case Key.Escape:
return goBack();
}
return false;
@@ -164,17 +166,22 @@ namespace osu.Game.Screens.Menu
switch (action)
{
case GlobalAction.Back:
switch (State)
{
case MenuState.TopLevel:
State = MenuState.Initial;
return true;
case MenuState.Play:
backButton.TriggerOnClick();
return true;
default:
return false;
}
return goBack();
default:
return false;
}
}
private bool goBack()
{
switch (State)
{
case MenuState.TopLevel:
State = MenuState.Initial;
return true;
case MenuState.Play:
backButton.TriggerOnClick();
return true;
default:
return false;
}