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

Final tidy-up pass

Browse Source
This commit is contained in:
Dean Herbert 2020-02-14 15:38:47 +09:00
parent edf9cfc863
commit 720ceca78a
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
osu.Game/Online/OnlineViewContainer.cs
View File

@ -19,7 +19,7 @@ namespace osu.Game.Online
private readonly Placeholder placeholder; private readonly Placeholder placeholder;
protected readonly LoadingAnimation LoadingAnimation; protected readonly LoadingAnimation LoadingAnimation;
protected const double TRANSFORM_TIME = 300.0; private const double transform_duration = 300;
protected override Container<Drawable> Content { get; } protected override Container<Drawable> Content { get; }
@ -44,8 +44,9 @@ namespace osu.Game.Online
protected override void LoadComplete() protected override void LoadComplete()
{ {
API.Register(this);
base.LoadComplete(); base.LoadComplete();
API.Register(this);
} }
public virtual void APIStateChanged(IAPIProvider api, APIState state) public virtual void APIStateChanged(IAPIProvider api, APIState state)
@ -54,14 +55,14 @@ namespace osu.Game.Online
{ {
case APIState.Offline: case APIState.Offline:
PopContentOut(Content); PopContentOut(Content);
placeholder.ScaleTo(0.8f).Then().ScaleTo(1, 3 * TRANSFORM_TIME, Easing.OutQuint); placeholder.ScaleTo(0.8f).Then().ScaleTo(1, 3 * transform_duration, Easing.OutQuint);
placeholder.FadeInFromZero(2 * TRANSFORM_TIME, Easing.OutQuint); placeholder.FadeInFromZero(2 * transform_duration, Easing.OutQuint);
LoadingAnimation.Hide(); LoadingAnimation.Hide();
break; break;
case APIState.Online: case APIState.Online:
PopContentIn(Content); PopContentIn(Content);
placeholder.FadeOut(TRANSFORM_TIME / 2, Easing.OutQuint); placeholder.FadeOut(transform_duration / 2, Easing.OutQuint);
LoadingAnimation.Hide(); LoadingAnimation.Hide();
break; break;
@ -69,7 +70,7 @@ namespace osu.Game.Online
case APIState.Connecting: case APIState.Connecting:
PopContentOut(Content); PopContentOut(Content);
LoadingAnimation.Show(); LoadingAnimation.Show();
placeholder.FadeOut(TRANSFORM_TIME / 2, Easing.OutQuint); placeholder.FadeOut(transform_duration / 2, Easing.OutQuint);
break; break;
} }
} }
@ -77,12 +78,12 @@ namespace osu.Game.Online
/// <summary> /// <summary>
/// Applies a transform to the online content to make it hidden. /// Applies a transform to the online content to make it hidden.
/// </summary> /// </summary>
protected virtual void PopContentOut(Drawable content) => content.FadeOut(TRANSFORM_TIME / 2, Easing.OutQuint); protected virtual void PopContentOut(Drawable content) => content.FadeOut(transform_duration / 2, Easing.OutQuint);
/// <summary> /// <summary>
/// Applies a transform to the online content to make it visible. /// Applies a transform to the online content to make it visible.
/// </summary> /// </summary>
protected virtual void PopContentIn(Drawable content) => content.FadeIn(TRANSFORM_TIME, Easing.OutQuint); protected virtual void PopContentIn(Drawable content) => content.FadeIn(transform_duration, Easing.OutQuint);
protected override void Dispose(bool isDisposing) protected override void Dispose(bool isDisposing)
{ {