From 8d1498a8db664f263cc9ed8cb8160aae81874cb3 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Thu, 23 Feb 2017 12:47:20 +0900 Subject: [PATCH] Fix initial state and shorten disappear animation. --- osu.Game/Overlays/Mods/ModSelectOverlay.cs | 10 +++++----- osu.Game/Overlays/WaveOverlayContainer.cs | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs index 4f6ce45b6c..0f568acc29 100644 --- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs +++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs @@ -107,14 +107,14 @@ namespace osu.Game.Overlays.Mods { base.PopOut(); - rankedMultiplerContainer.MoveToX(rankedMultiplerContainer.DrawSize.X, CONTENT_DURATION, EasingTypes.InSine); - rankedMultiplerContainer.FadeOut(CONTENT_DURATION, EasingTypes.InSine); + rankedMultiplerContainer.MoveToX(rankedMultiplerContainer.DrawSize.X, APPEAR_DURATION, EasingTypes.InSine); + rankedMultiplerContainer.FadeOut(APPEAR_DURATION, EasingTypes.InSine); foreach (ModSection section in sections) { - section.ButtonsContainer.TransformSpacingTo(new Vector2(100f, 0f), CONTENT_DURATION, EasingTypes.InSine); - section.ButtonsContainer.MoveToX(100f, CONTENT_DURATION, EasingTypes.InSine); - section.ButtonsContainer.FadeOut(CONTENT_DURATION, EasingTypes.InSine); + section.ButtonsContainer.TransformSpacingTo(new Vector2(100f, 0f), APPEAR_DURATION, EasingTypes.InSine); + section.ButtonsContainer.MoveToX(100f, APPEAR_DURATION, EasingTypes.InSine); + section.ButtonsContainer.FadeOut(APPEAR_DURATION, EasingTypes.InSine); } TriggerFocusLost(); diff --git a/osu.Game/Overlays/WaveOverlayContainer.cs b/osu.Game/Overlays/WaveOverlayContainer.cs index b62f3a00f4..e8268452c4 100644 --- a/osu.Game/Overlays/WaveOverlayContainer.cs +++ b/osu.Game/Overlays/WaveOverlayContainer.cs @@ -15,7 +15,8 @@ namespace osu.Game.Overlays { public abstract class WaveOverlayContainer : OverlayContainer { - protected const float CONTENT_DURATION = 800; + protected const float APPEAR_DURATION = 800; + protected const float DISAPPEAR_DURATION = 500; private const EasingTypes easing_show = EasingTypes.OutSine; private const EasingTypes easing_hide = EasingTypes.InSine; @@ -139,14 +140,14 @@ namespace osu.Game.Overlays foreach (var w in wavesContainer.Children) w.State = Visibility.Visible; - contentContainer.FadeIn(CONTENT_DURATION, EasingTypes.OutQuint); - contentContainer.MoveToY(0, CONTENT_DURATION, EasingTypes.OutQuint); + contentContainer.FadeIn(APPEAR_DURATION, EasingTypes.OutQuint); + contentContainer.MoveToY(0, APPEAR_DURATION, EasingTypes.OutQuint); } protected override void PopOut() { - contentContainer.FadeOut(CONTENT_DURATION, easing_hide); - contentContainer.MoveToY(DrawHeight * 2f, CONTENT_DURATION, easing_hide); + contentContainer.FadeOut(DISAPPEAR_DURATION, EasingTypes.In); + contentContainer.MoveToY(DrawHeight * 2f, DISAPPEAR_DURATION, EasingTypes.In); foreach (var w in wavesContainer.Children) w.State = Visibility.Hidden; @@ -183,16 +184,15 @@ namespace osu.Game.Overlays get { return state; } set { - if (value == state) return; state = value; switch (value) { case Visibility.Hidden: - MoveToY(DrawHeight / Height, CONTENT_DURATION, easing_hide); + MoveToY(DrawHeight / Height, DISAPPEAR_DURATION, easing_hide); break; case Visibility.Visible: - MoveToY(FinalPosition, CONTENT_DURATION, easing_show); + MoveToY(FinalPosition, APPEAR_DURATION, easing_show); break; } }