From 2a2f4e2a8b8e86ccf671c539690bc9c11c1e3384 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 19 Jul 2017 16:13:01 +0900 Subject: [PATCH] Ensure side flashes are not visible during moving transitions --- osu.Game/Screens/Menu/MainMenu.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs index f4cb6dba7b..d5526532cb 100644 --- a/osu.Game/Screens/Menu/MainMenu.cs +++ b/osu.Game/Screens/Menu/MainMenu.cs @@ -28,6 +28,8 @@ public class MainMenu : OsuScreen private readonly BackgroundScreenDefault background; private Screen songSelect; + private MenuSideFlashes sideFlashes; + protected override BackgroundScreen CreateBackground() => background; public MainMenu() @@ -52,7 +54,7 @@ public MainMenu() } } }, - new MenuSideFlashes(), + sideFlashes = new MenuSideFlashes(), }; } @@ -112,6 +114,8 @@ protected override void OnSuspending(Screen next) Content.FadeOut(length, EasingTypes.InSine); Content.MoveTo(new Vector2(-800, 0), length, EasingTypes.InSine); + + sideFlashes.FadeOut(length / 4, EasingTypes.OutQuint); } protected override void OnResuming(Screen last) @@ -129,6 +133,8 @@ protected override void OnResuming(Screen last) Content.FadeIn(length, EasingTypes.OutQuint); Content.MoveTo(new Vector2(0, 0), length, EasingTypes.OutQuint); + + sideFlashes.FadeIn(length / 4, EasingTypes.InQuint); } protected override bool OnExiting(Screen next)