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

Merge branch 'master' into fix-main-menu-escape

Browse Source
This commit is contained in:
Dan Balasescu
2018-05-22 18:17:51 +09:00
committed by GitHub
parent d109522bf7 c0802b5646
commit 99163ca8ba
18 changed files with 398 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,8 @@ namespace osu.Game.Screens.Menu
{
public event Action<MenuState> StateChanged;
private readonly BindableBool showOverlays = new BindableBool();
private readonly BindableBool hideOverlaysOnEnter = new BindableBool();
private readonly BindableBool allowOpeningOverlays = new BindableBool();
public Action OnEdit;
public Action OnExit;
@ -135,7 +136,12 @@ namespace osu.Game.Screens.Menu
[BackgroundDependencyLoader(true)]
private void load(AudioManager audio, OsuGame game)
{
if (game != null) showOverlays.BindTo(game.ShowOverlays);
if (game != null)
{
hideOverlaysOnEnter.BindTo(game.HideOverlaysOnEnter);
allowOpeningOverlays.BindTo(game.AllowOpeningOverlays);
}
sampleBack = audio.Sample.Get(@"Menu/button-back-select");
}
@ -329,8 +335,6 @@ namespace osu.Game.Screens.Menu
logoDelayedAction = Scheduler.AddDelayed(() =>
{
showOverlays.Value = false;
logo.ClearTransforms(targetMember: nameof(Position));
logo.RelativePositionAxes = Axes.Both;
@ -358,7 +362,8 @@ namespace osu.Game.Screens.Menu
logoTracking = true;
logo.Impact();
showOverlays.Value = true;
hideOverlaysOnEnter.Value = false;
allowOpeningOverlays.Value = true;
}, 200);
break;
default: