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

Fix escape not always handling back action correctly at main menu (back button not yet visible).

Browse Source
This commit is contained in:
Dean Herbert
2017-02-07 21:53:40 +09:00
parent dc5e9dde56
commit d06f0cf870
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,7 +85,7 @@ namespace osu.Game.Screens.Menu
Children = new[] Children = new[]
{ {
settingsButton = new Button(@"settings", @"options", FontAwesome.fa_gear, new Color4(85, 85, 85, 255), () => OnSettings?.Invoke(), -WEDGE_WIDTH, Key.O), settingsButton = new Button(@"settings", @"options", FontAwesome.fa_gear, new Color4(85, 85, 85, 255), () => OnSettings?.Invoke(), -WEDGE_WIDTH, Key.O),
backButton = new Button(@"back", @"back", FontAwesome.fa_osu_left_o, new Color4(51, 58, 94, 255), onBack, -WEDGE_WIDTH, Key.Escape), backButton = new Button(@"back", @"back", FontAwesome.fa_osu_left_o, new Color4(51, 58, 94, 255), onBack, -WEDGE_WIDTH),
iconFacade = new Container //need a container to make the osu! icon flow properly. iconFacade = new Container //need a container to make the osu! icon flow properly.
{ {
Size = new Vector2(0, BUTTON_AREA_HEIGHT) Size = new Vector2(0, BUTTON_AREA_HEIGHT)
@ -140,11 +140,18 @@ namespace osu.Game.Screens.Menu
osuLogo.TriggerClick(state); osuLogo.TriggerClick(state);
return true; return true;
case Key.Escape: case Key.Escape:
if (State == MenuState.Initial) switch (State)
return false; {
case MenuState.TopLevel:
State = MenuState.Initial;
return true;
case MenuState.Play:
State = MenuState.TopLevel;
return true;
}
State = MenuState.Initial;
return true; return false;
} }
return false; return false;