h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-16 06:17:19 +08:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/ppy/master' into colour-provider-implementation

Browse Source
This commit is contained in:
Andrei Zavatski 2020-01-24 12:24:06 +03:00
commit 792436890b
1 changed files with 17 additions and 16 deletions

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

@ -78,7 +78,21 @@ namespace osu.Game.Screens.Menu
holdDelay = config.GetBindable<float>(OsuSetting.UIHoldActivationDelay); holdDelay = config.GetBindable<float>(OsuSetting.UIHoldActivationDelay);
loginDisplayed = statics.GetBindable<bool>(Static.LoginOverlayDisplayed); 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 buttonsContainer = new ParallaxContainer
{ {
@ -101,23 +115,10 @@ namespace osu.Game.Screens.Menu
Anchor = Anchor.TopRight, Anchor = Anchor.TopRight,
Origin = Anchor.TopRight, Origin = Anchor.TopRight,
Margin = new MarginPadding { Right = 15, Top = 5 } 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 => buttons.StateChanged += state =>
{ {
switch (state) switch (state)