RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Smoothly transform the chat height when opening the channel selection

This commit is contained in:
MrTheMake 2017-09-12 18:47:21 +02:00
parent c78695cfe0
commit 9839a3b937
1 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
osu.Game/Overlays/ChatOverlay.cs
View File

@ -12,8 +12,10 @@
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Transforms;
using osu.Framework.Graphics.UserInterface; using osu.Framework.Graphics.UserInterface;
using osu.Framework.Input; using osu.Framework.Input;
using osu.Framework.MathUtils;
using osu.Framework.Threading; using osu.Framework.Threading;
using osu.Game.Configuration; using osu.Game.Configuration;
using osu.Game.Graphics; using osu.Game.Graphics;
@ -56,7 +58,7 @@ public class ChatOverlay : OsuFocusedOverlayContainer, IOnlineComponent
private readonly Box chatBackground; private readonly Box chatBackground;
private readonly Box tabBackground; private readonly Box tabBackground;
private Bindable<double> chatHeight; public Bindable<double> ChatHeight { get; internal set; }
private readonly Container channelSelectionContainer; private readonly Container channelSelectionContainer;
private readonly ChannelSelectionOverlay channelSelection; private readonly ChannelSelectionOverlay channelSelection;
@ -177,17 +179,11 @@ public ChatOverlay()
if (state == Visibility.Visible) if (state == Visibility.Visible)
{ {
textbox.HoldFocus = false; textbox.HoldFocus = false;
if (1f - chatHeight.Value < channel_selection_min_height) if (1f - ChatHeight.Value < channel_selection_min_height)
{ transformChatHeightTo(1f - channel_selection_min_height, 800, Easing.OutQuint);
chatContainer.ResizeHeightTo(1f - channel_selection_min_height, 800, Easing.OutQuint);
channelSelectionContainer.ResizeHeightTo(channel_selection_min_height, 800, Easing.OutQuint);
chatHeight.Value = 1f - channel_selection_min_height;
}
} }
else else
{
textbox.HoldFocus = true; textbox.HoldFocus = true;
}
}; };
} }
@ -201,7 +197,7 @@ protected override bool OnDragStart(InputState state)
if (!isDragging) if (!isDragging)
return base.OnDragStart(state); return base.OnDragStart(state);
startDragChatHeight = chatHeight.Value; startDragChatHeight = ChatHeight.Value;
return true; return true;
} }
@ -217,7 +213,7 @@ protected override bool OnDrag(InputState state)
if (channelSelection.State == Visibility.Visible && targetChatHeight > 1f - channel_selection_min_height) if (channelSelection.State == Visibility.Visible && targetChatHeight > 1f - channel_selection_min_height)
targetChatHeight = 1f - channel_selection_min_height; targetChatHeight = 1f - channel_selection_min_height;
chatHeight.Value = targetChatHeight; ChatHeight.Value = targetChatHeight;
} }
return true; return true;
@ -277,14 +273,14 @@ private void load(APIAccess api, OsuConfigManager config, OsuColour colours)
this.api = api; this.api = api;
api.Register(this); api.Register(this);
chatHeight = config.GetBindable<double>(OsuSetting.ChatDisplayHeight); ChatHeight = config.GetBindable<double>(OsuSetting.ChatDisplayHeight);
chatHeight.ValueChanged += h => ChatHeight.ValueChanged += h =>
{ {
chatContainer.Height = (float)h; chatContainer.Height = (float)h;
channelSelectionContainer.Height = 1f - (float)h; channelSelectionContainer.Height = 1f - (float)h;
tabBackground.FadeTo(h == 1 ? 1 : 0.8f, 200); tabBackground.FadeTo(h == 1 ? 1 : 0.8f, 200);
}; };
chatHeight.TriggerChange(); ChatHeight.TriggerChange();
chatBackground.Colour = colours.ChatBlue; chatBackground.Colour = colours.ChatBlue;
} }
@ -506,5 +502,26 @@ private void postMessage(TextBox textbox, bool newText)
api.Queue(req); api.Queue(req);
} }
private void transformChatHeightTo(double newChatHeight, double duration = 0, Easing easing = Easing.None)
{
this.TransformTo(this.PopulateTransform(new TransformChatHeight(), newChatHeight, duration, easing));
}
private class TransformChatHeight : Transform<double, ChatOverlay>
{
private double valueAt(double time)
{
if (time < StartTime) return StartValue;
if (time >= EndTime) return EndValue;
return Interpolation.ValueAt(time, StartValue, EndValue, StartTime, EndTime, Easing);
}
public override string TargetMember => "ChatHeight.Value";
protected override void Apply(ChatOverlay d, double time) => d.ChatHeight.Value = valueAt(time);
protected override void ReadIntoStartValue(ChatOverlay d) => StartValue = d.ChatHeight.Value;
}
} }
} }