sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 23:24:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into use-modelbackeddrawable

Browse Source
This commit is contained in:
Dan Balasescu
2019-06-21 14:26:07 +09:00
committed by GitHub
parent 5f5441c692 88f449e3a1
commit c79c4641f3
31 changed files with 491 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game/Overlays/Chat/ChatLine.cs
View File

@ -74,17 +74,12 @@ namespace osu.Game.Overlays.Chat
}
}
private bool senderHasBackground => !string.IsNullOrEmpty(message.Sender.Colour);
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
customUsernameColour = colours.ChatBlue;
}
private bool senderHasBackground => !string.IsNullOrEmpty(message.Sender.Colour);
protected override void LoadComplete()
{
base.LoadComplete();
bool hasBackground = senderHasBackground;
@ -179,6 +174,11 @@ namespace osu.Game.Overlays.Chat
};
updateMessageContent();
}
protected override void LoadComplete()
{
base.LoadComplete();
FinishTransforms(true);
}

19
osu.Game/Overlays/Chat/DrawableChannel.cs
View File

@ -5,6 +5,7 @@ using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using osu.Framework.Allocation;
using osuTK.Graphics;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
@ -17,15 +18,18 @@ namespace osu.Game.Overlays.Chat
public class DrawableChannel : Container
{
public readonly Channel Channel;
protected readonly ChatLineContainer ChatLineFlow;
private readonly OsuScrollContainer scroll;
protected ChatLineContainer ChatLineFlow;
private OsuScrollContainer scroll;
public DrawableChannel(Channel channel)
{
Channel = channel;
RelativeSizeAxes = Axes.Both;
}
[BackgroundDependencyLoader]
private void load()
{
Children = new Drawable[]
{
scroll = new OsuScrollContainer
@ -48,18 +52,17 @@ namespace osu.Game.Overlays.Chat
},
}
};
}
protected override void LoadComplete()
{
base.LoadComplete();
newMessagesArrived(Channel.Messages);
Channel.NewMessagesArrived += newMessagesArrived;
Channel.MessageRemoved += messageRemoved;
Channel.PendingMessageResolved += pendingMessageResolved;
}
protected override void LoadComplete()
{
base.LoadComplete();
scrollToEnd();
}