h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-14 03:25:11 +08:00
Code Issues Releases Wiki Activity

Ensure toolbar disappears when osu logo transition is cancelled

Browse Source
This commit is contained in:
Thomas Müller 2017-07-18 17:09:53 +03:00
parent b40c897dbd
commit 3ba119c115
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -224,12 +224,11 @@ namespace osu.Game.Screens.Menu
{
case MenuState.Exit:
case MenuState.Initial:
toolbar?.Hide();
buttonAreaBackground.ScaleTo(Vector2.One, 500, EasingTypes.Out);
buttonArea.FadeOut(300);
osuLogo.Delay(150)
.Schedule(() => toolbar?.Hide())
.ScaleTo(1, 800, EasingTypes.OutExpo)
.MoveTo(Vector2.Zero, 800, EasingTypes.OutExpo);
@ -250,16 +249,19 @@ namespace osu.Game.Screens.Menu
case MenuState.TopLevel:
buttonAreaBackground.ScaleTo(Vector2.One, 200, EasingTypes.Out);
osuLogo.MoveTo(buttonFlow.DrawPosition, 200, EasingTypes.In);
var sequence = osuLogo.ScaleTo(0.5f, 200, EasingTypes.In);
var sequence = osuLogo
.ScaleTo(0.5f, 200, EasingTypes.In)
.MoveTo(buttonFlow.DrawPosition, 200, EasingTypes.In);
if (fromInitial && osuLogo.Scale.X > 0.5f)
sequence.OnComplete(o => o.Impact());
sequence.OnComplete(o =>
{
o.Impact();
toolbar?.Show();
});
buttonArea.FadeIn(300);
Scheduler.AddDelayed(() => toolbar?.Show(), 150);
foreach (Button b in buttonsTopLevel)
b.State = ButtonState.Expanded;