RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix regressed input handling order

This commit is contained in:
Dean Herbert 2020-01-24 16:34:13 +09:00
parent 159c8087fb
commit f9e93e2a6a
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
osu.Game/Screens/Menu/MainMenu.cs
View File

@ -78,7 +78,21 @@ private void load(DirectOverlay direct, SettingsOverlay settings, OsuConfigManag
holdDelay = config.GetBindable<float>(OsuSetting.UIHoldActivationDelay);
loginDisplayed = statics.GetBindable<bool>(Static.LoginOverlayDisplayed);
AddRangeInternal(new Drawable[]
if (host.CanExit)
{
AddInternal(exitConfirmOverlay = new ExitConfirmOverlay
{
Action = () =>
{
if (holdDelay.Value > 0)
confirmAndExit();
else
this.Exit();
}
});
}
AddRangeInternal(new[]
{
buttonsContainer = new ParallaxContainer
{
@ -101,23 +115,10 @@ private void load(DirectOverlay direct, SettingsOverlay settings, OsuConfigManag
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
Margin = new MarginPadding { Right = 15, Top = 5 }
}
},
exitConfirmOverlay.CreateProxy()
});
if (host.CanExit)
{
AddInternal(exitConfirmOverlay = new ExitConfirmOverlay
{
Action = () =>
{
if (holdDelay.Value > 0)
confirmAndExit();
else
this.Exit();
}
});
}
buttons.StateChanged += state =>
{
switch (state)