diff --git a/osu.Game/Online/Chat/Display/ChannelDisplay.cs b/osu.Game/Online/Chat/Display/ChannelDisplay.cs index f4c4417cd3..ad7db24a55 100644 --- a/osu.Game/Online/Chat/Display/ChannelDisplay.cs +++ b/osu.Game/Online/Chat/Display/ChannelDisplay.cs @@ -13,7 +13,7 @@ namespace osu.Game.Online.Chat.Display { - public class ChannelDisplay : FlowContainer + public class ChannelDisplay : Container { private readonly Channel channel; private FlowContainer flow; @@ -25,7 +25,6 @@ public ChannelDisplay(Channel channel) channel.NewMessagesArrived += newMessages; RelativeSizeAxes = Axes.Both; - Direction = FlowDirection.VerticalOnly; Children = new Drawable[] { @@ -39,14 +38,12 @@ public ChannelDisplay(Channel channel) }, new ScrollContainer { - RelativeSizeAxes = Axes.Both, Children = new Drawable[] { flow = new FlowContainer { Direction = FlowDirection.VerticalOnly, RelativeSizeAxes = Axes.X, - LayoutEasing = EasingTypes.Out, Spacing = new Vector2(1, 1) } } diff --git a/osu.Game/Overlays/ChatConsole.cs b/osu.Game/Overlays/ChatConsole.cs index c8e9cb2233..8f068fd8ed 100644 --- a/osu.Game/Overlays/ChatConsole.cs +++ b/osu.Game/Overlays/ChatConsole.cs @@ -44,19 +44,19 @@ public ChatConsole() Anchor = Anchor.BottomLeft; Origin = Anchor.BottomLeft; - InternalChildren = new Drawable[] + AddInternal(new Drawable[] { new Box { Depth = float.MinValue, RelativeSizeAxes = Axes.Both, - Colour = new Color4(0.1f, 0.1f, 0.1f, 0.4f) + Colour = new Color4(0.1f, 0.1f, 0.1f, 0.4f), }, content = new Container { RelativeSizeAxes = Axes.Both, } - }; + }); } public override void Load() @@ -76,12 +76,6 @@ private void initializeChannels() //if (api.State != APIAccess.APIState.Online) // return; - Add(new FlowContainer - { - RelativeSizeAxes = Axes.Both, - Direction = FlowDirection.VerticalOnly - }); - SpriteText loading; Add(loading = new SpriteText { @@ -99,9 +93,9 @@ private void initializeChannels() Scheduler.Add(delegate { loading.FadeOut(100); + addChannel(channels.Find(c => c.Name == @"#osu")); }); - - addChannel(channels.Find(c => c.Name == @"#osu")); + //addChannel(channels.Find(c => c.Name == @"#lobby")); //addChannel(channels.Find(c => c.Name == @"#english"));