mirror of
https://github.com/ppy/osu.git
synced 2025-03-19 05:57:19 +08:00
Merge pull request #643 from peppy/general-fixes
Updates in-line with framework.
This commit is contained in:
commit
3659ee891c
@ -1 +1 @@
|
||||
Subproject commit 979fb1ffdfaa08c39ff4f0cdda42e5b313d70534
|
||||
Subproject commit 21a97586f7fa8d9aa65b4131824151d88a70b520
|
@ -27,7 +27,7 @@ namespace osu.Game.Overlays.Toolbar
|
||||
|
||||
protected override bool HideOnEscape => false;
|
||||
|
||||
protected override bool BlockPassThroughInput => false;
|
||||
protected override bool BlockPassThroughMouse => false;
|
||||
|
||||
private const double transition_time = 500;
|
||||
|
||||
|
@ -25,6 +25,8 @@ namespace osu.Game.Screens.Play
|
||||
|
||||
protected override bool HideOnEscape => false;
|
||||
|
||||
protected override bool BlockPassThroughKeyboard => true;
|
||||
|
||||
public Action OnRetry;
|
||||
public Action OnQuit;
|
||||
|
||||
|
@ -47,7 +47,7 @@ namespace osu.Game.Screens.Select
|
||||
|
||||
protected override bool HideOnEscape => false;
|
||||
|
||||
protected override bool BlockPassThroughInput => false;
|
||||
protected override bool BlockPassThroughMouse => false;
|
||||
|
||||
protected override void PopIn()
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user