diff --git a/osu.Game/Screens/Loader.cs b/osu.Game/Screens/Loader.cs index 6de53aeeb0..8c70e2421b 100644 --- a/osu.Game/Screens/Loader.cs +++ b/osu.Game/Screens/Loader.cs @@ -17,9 +17,9 @@ namespace osu.Game.Screens ValidForResume = false; } - protected override void LogoSetup(OsuLogo logo, bool resuming) + protected override void OnArrivedLogo(OsuLogo logo, bool resuming) { - base.LogoSetup(logo, resuming); + base.OnArrivedLogo(logo, resuming); logo.RelativePositionAxes = Axes.Both; logo.Triangles = false; diff --git a/osu.Game/Screens/Menu/Intro.cs b/osu.Game/Screens/Menu/Intro.cs index 9efe7455f7..2cd51f05db 100644 --- a/osu.Game/Screens/Menu/Intro.cs +++ b/osu.Game/Screens/Menu/Intro.cs @@ -109,9 +109,9 @@ namespace osu.Game.Screens.Menu public const int EXIT_DELAY = 3000; - protected override void LogoSetup(OsuLogo logo, bool resuming) + protected override void OnArrivedLogo(OsuLogo logo, bool resuming) { - base.LogoSetup(logo, resuming); + base.OnArrivedLogo(logo, resuming); logo.RelativePositionAxes = Axes.Both; diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs index 77e45c4575..6f01199a60 100644 --- a/osu.Game/Screens/Menu/MainMenu.cs +++ b/osu.Game/Screens/Menu/MainMenu.cs @@ -103,9 +103,9 @@ namespace osu.Game.Screens.Menu Beatmap.ValueChanged += beatmap_ValueChanged; } - protected override void LogoSetup(OsuLogo logo, bool resuming) + protected override void OnArrivedLogo(OsuLogo logo, bool resuming) { - base.LogoSetup(logo, resuming); + base.OnArrivedLogo(logo, resuming); buttons.SetOsuLogo(logo); @@ -119,7 +119,7 @@ namespace osu.Game.Screens.Menu buttons.State = MenuState.TopLevel; } - protected override void LogoOnSuspending(OsuLogo logo) + protected override void OnSuspendingLogo(OsuLogo logo) { logo.FadeOut(300, Easing.InSine) .ScaleTo(0.2f, 300, Easing.InSine) diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs index a7e1dd0f25..2693ad97fa 100644 --- a/osu.Game/Screens/OsuScreen.cs +++ b/osu.Game/Screens/OsuScreen.cs @@ -76,14 +76,14 @@ namespace osu.Game.Screens protected override void OnResuming(Screen last) { base.OnResuming(last); - logo.DelayUntilTransformsFinished().Schedule(() => LogoSetup(logo, true)); + logo.DelayUntilTransformsFinished().Schedule(() => OnArrivedLogo(logo, true)); sampleExit?.Play(); } protected override void OnSuspending(Screen next) { base.OnSuspending(next); - logoOnSuspending(); + onSuspendingLogo(); } protected override void OnEntering(Screen last) @@ -122,13 +122,13 @@ namespace osu.Game.Screens base.OnEntering(last); - logo.DelayUntilTransformsFinished().Schedule(() => LogoSetup(logo, false)); + logo.DelayUntilTransformsFinished().Schedule(() => OnArrivedLogo(logo, false)); } protected override bool OnExiting(Screen next) { if (ValidForResume && logo != null) - logoOnExiting(); + onExitingLogo(); OsuScreen nextOsu = next as OsuScreen; @@ -148,29 +148,38 @@ namespace osu.Game.Screens return false; } - protected virtual void LogoSetup(OsuLogo logo, bool resuming) + /// + /// Fired when this screen was entered or resumed and the logo state is required to be adjusted. + /// + protected virtual void OnArrivedLogo(OsuLogo logo, bool resuming) { logo.Action = null; logo.FadeOut(300, Easing.OutQuint); } - private void logoOnExiting() + private void onExitingLogo() { logo.ClearTransforms(); - LogoOnExiting(logo); + OnExitingLogo(logo); } - protected virtual void LogoOnExiting(OsuLogo logo) + /// + /// Fired when this screen was exited to add any outwards transition to the logo. + /// + protected virtual void OnExitingLogo(OsuLogo logo) { } - private void logoOnSuspending() + private void onSuspendingLogo() { logo.ClearTransforms(); - LogoOnSuspending(logo); + OnSuspendingLogo(logo); } - protected virtual void LogoOnSuspending(OsuLogo logo) + /// + /// Fired when this screen was suspended to add any outwards transition to the logo. + /// + protected virtual void OnSuspendingLogo(OsuLogo logo) { } } diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs index e53026fb8d..6e96fb8b71 100644 --- a/osu.Game/Screens/Play/PlayerLoader.cs +++ b/osu.Game/Screens/Play/PlayerLoader.cs @@ -95,9 +95,9 @@ namespace osu.Game.Screens.Play this.Delay(2150).Schedule(pushWhenLoaded); } - protected override void LogoSetup(OsuLogo logo, bool resuming) + protected override void OnArrivedLogo(OsuLogo logo, bool resuming) { - base.LogoSetup(logo, resuming); + base.OnArrivedLogo(logo, resuming); logo.ClearTransforms(targetMember: nameof(Position)); logo.RelativePositionAxes = Axes.Both; diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs index f9e3b0902d..11e7d452fa 100644 --- a/osu.Game/Screens/Select/SongSelect.cs +++ b/osu.Game/Screens/Select/SongSelect.cs @@ -311,9 +311,9 @@ namespace osu.Game.Screens.Select private const double logo_transition = 250; - protected override void LogoSetup(OsuLogo logo, bool resuming) + protected override void OnArrivedLogo(OsuLogo logo, bool resuming) { - base.LogoSetup(logo, resuming); + base.OnArrivedLogo(logo, resuming); logo.ClearTransforms(); logo.RelativePositionAxes = Axes.Both; @@ -337,9 +337,9 @@ namespace osu.Game.Screens.Select logo.Action = () => carouselRaisedStart(); } - protected override void LogoOnExiting(OsuLogo logo) + protected override void OnExitingLogo(OsuLogo logo) { - base.LogoOnExiting(logo); + base.OnExitingLogo(logo); logo.ScaleTo(0.2f, logo_transition, Easing.OutQuint); logo.FadeOut(logo_transition, Easing.OutQuint); }