From fad5b4ca9d4c33acddca01c613971e5e7cc6225a Mon Sep 17 00:00:00 2001 From: DrabWeb Date: Thu, 1 Jun 2017 06:10:26 -0300 Subject: [PATCH] Speed up animations --- osu.Game/Overlays/Chat/ChannelListItem.cs | 2 +- osu.Game/Overlays/Chat/ChannelSelectionOverlay.cs | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/osu.Game/Overlays/Chat/ChannelListItem.cs b/osu.Game/Overlays/Chat/ChannelListItem.cs index 825f0ae980..1a2d74b060 100644 --- a/osu.Game/Overlays/Chat/ChannelListItem.cs +++ b/osu.Game/Overlays/Chat/ChannelListItem.cs @@ -154,7 +154,7 @@ namespace osu.Game.Overlays.Chat protected override bool OnHover(InputState state) { if (!channel.Joined.Value) - name.FadeColour(hoverColour, transition_duration); + name.FadeColour(hoverColour, 50, EasingTypes.OutQuint); return base.OnHover(state); } diff --git a/osu.Game/Overlays/Chat/ChannelSelectionOverlay.cs b/osu.Game/Overlays/Chat/ChannelSelectionOverlay.cs index 5e76468fde..cd736a5fe9 100644 --- a/osu.Game/Overlays/Chat/ChannelSelectionOverlay.cs +++ b/osu.Game/Overlays/Chat/ChannelSelectionOverlay.cs @@ -23,6 +23,8 @@ namespace osu.Game.Overlays.Chat { public static readonly float WIDTH_PADDING = 170; + private const float transition_duration = 500; + private readonly Box bg; private readonly Triangles triangles; private readonly Box headerBg; @@ -157,8 +159,8 @@ namespace osu.Game.Overlays.Chat { if (Alpha == 0) MoveToY(DrawHeight); - FadeIn(100, EasingTypes.OutQuint); - MoveToY(0, 800, EasingTypes.OutQuint); + FadeIn(transition_duration, EasingTypes.OutQuint); + MoveToY(0, transition_duration, EasingTypes.OutQuint); search.HoldFocus = true; base.PopIn(); @@ -166,8 +168,8 @@ namespace osu.Game.Overlays.Chat protected override void PopOut() { - FadeOut(500, EasingTypes.InQuint); - MoveToY(DrawHeight, 500, EasingTypes.In); + FadeOut(transition_duration, EasingTypes.InSine); + MoveToY(DrawHeight, transition_duration, EasingTypes.InSine); search.HoldFocus = false; base.PopOut();