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

Fix some display regressions in ChatConsole.

This commit is contained in:
Dean Herbert 2016-10-12 13:35:21 +09:00
parent c0ea061bd4
commit 05031d18ef
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Online/Chat/Display/ChannelDisplay.cs
View File

@ -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)
}
}

14
osu.Game/Overlays/ChatConsole.cs
View File

@ -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"));