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

Merge pull request #643 from peppy/general-fixes

Browse Source 
Updates in-line with framework.
This commit is contained in:
Dean Herbert
2017-04-18 16:34:34 +09:00
committed by GitHub
parent 7fbbe74b65 64a8992153
commit 3659ee891c
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

Submodule osu-framework updated: 979fb1ffdf...21a97586f7

2
osu.Game/Overlays/Toolbar/Toolbar.cs
View File

@ -27,7 +27,7 @@ namespace osu.Game.Overlays.Toolbar
protected override bool HideOnEscape => false; protected override bool HideOnEscape => false;
protected override bool BlockPassThroughInput => false; protected override bool BlockPassThroughMouse => false;
private const double transition_time = 500; private const double transition_time = 500;

2
osu.Game/Screens/Play/MenuOverlay.cs
View File

@ -25,6 +25,8 @@ namespace osu.Game.Screens.Play
protected override bool HideOnEscape => false; protected override bool HideOnEscape => false;
protected override bool BlockPassThroughKeyboard => true;
public Action OnRetry; public Action OnRetry;
public Action OnQuit; public Action OnQuit;

2
osu.Game/Screens/Select/BeatmapInfoWedge.cs
View File

@ -47,7 +47,7 @@ namespace osu.Game.Screens.Select
protected override bool HideOnEscape => false; protected override bool HideOnEscape => false;
protected override bool BlockPassThroughInput => false; protected override bool BlockPassThroughMouse => false;
protected override void PopIn() protected override void PopIn()
{ {