h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-16 03:02:56 +08:00
Code Issues Releases Wiki Activity

Update ChatLine timestamp and message colours

Browse Source
This commit is contained in:
Jai Sharma 2022-06-08 13:51:16 +01:00
parent dfa31df2af
commit 04b434b8ce
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,6 +66,8 @@ namespace osu.Game.Overlays.Chat
private bool senderHasColour => !string.IsNullOrEmpty(message.Sender.Colour); private bool senderHasColour => !string.IsNullOrEmpty(message.Sender.Colour);
private bool messageHasColour => Message.IsAction && senderHasColour;
[Resolved(CanBeNull = true)] [Resolved(CanBeNull = true)]
private ChannelManager? chatManager { get; set; } private ChannelManager? chatManager { get; set; }
@ -80,7 +82,7 @@ namespace osu.Game.Overlays.Chat
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load(OverlayColourProvider? colourProvider)
{ {
usernameColour = senderHasColour usernameColour = senderHasColour
? Color4Extensions.FromHex(message.Sender.Colour) ? Color4Extensions.FromHex(message.Sender.Colour)
@ -113,6 +115,7 @@ namespace osu.Game.Overlays.Chat
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,
Font = OsuFont.GetFont(size: TextSize * 0.75f, weight: FontWeight.SemiBold, fixedWidth: true), Font = OsuFont.GetFont(size: TextSize * 0.75f, weight: FontWeight.SemiBold, fixedWidth: true),
MaxWidth = TimestampWidth, MaxWidth = TimestampWidth,
Colour = colourProvider?.Background1 ?? Colour4.White,
}, },
new MessageSender(message.Sender) new MessageSender(message.Sender)
{ {
@ -128,16 +131,8 @@ namespace osu.Game.Overlays.Chat
ContentFlow = new LinkFlowContainer(t => ContentFlow = new LinkFlowContainer(t =>
{ {
t.Shadow = false; t.Shadow = false;
t.Font = t.Font.With(size: TextSize, italics: Message.IsAction);
if (Message.IsAction) t.Colour = messageHasColour ? Color4Extensions.FromHex(message.Sender.Colour) : colourProvider?.Content1 ?? Colour4.White;
{
t.Font = OsuFont.GetFont(italics: true);
if (senderHasColour)
t.Colour = Color4Extensions.FromHex(message.Sender.Colour);
}
t.Font = t.Font.With(size: TextSize);
}) })
{ {
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,