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

Fix multiple order-of-execution issues with osu! logo

Browse Source 
Also sets better defaults.
This commit is contained in:
Dean Herbert
2017-11-13 18:43:05 +09:00
parent 615984ca9c
commit 49a5af60e2
7 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
osu.Game/Screens/OsuScreen.cs
View File

@ -76,7 +76,7 @@ namespace osu.Game.Screens
protected override void OnResuming(Screen last)
{
base.OnResuming(last);
logo.DelayUntilTransformsFinished().Schedule(() => LogoArriving(logo, true));
logo.AppendAnimatingAction(() => LogoArriving(logo, true), true);
sampleExit?.Play();
}
@ -118,11 +118,11 @@ namespace osu.Game.Screens
}
if ((logo = lastOsu?.logo) == null)
LoadComponentAsync(logo = new OsuLogo(), AddInternal);
LoadComponentAsync(logo = new OsuLogo { Alpha = 0 }, AddInternal);
logo.AppendAnimatingAction(() => LogoArriving(logo, false), true);
base.OnEntering(last);
logo.DelayUntilTransformsFinished().Schedule(() => LogoArriving(logo, false));
}
protected override bool OnExiting(Screen next)
@ -155,12 +155,16 @@ namespace osu.Game.Screens
{
logo.Action = null;
logo.FadeOut(300, Easing.OutQuint);
logo.Anchor = Anchor.TopLeft;
logo.Origin = Anchor.Centre;
logo.RelativePositionAxes = Axes.None;
logo.Triangles = true;
logo.Ripple = true;
}
private void onExitingLogo()
{
logo.ClearTransforms();
LogoExiting(logo);
logo.AppendAnimatingAction(() => { LogoExiting(logo); }, false);
}
/// <summary>
@ -172,8 +176,7 @@ namespace osu.Game.Screens
private void onSuspendingLogo()
{
logo.ClearTransforms();
LogoSuspending(logo);
logo.AppendAnimatingAction(() => { LogoSuspending(logo); }, false);
}
/// <summary>