epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix global chat history buffer timestamps.

Browse Source
This commit is contained in:
Paul Chote
2017-09-24 20:51:40 +01:00
committed by reaperrr
parent 9aaf800bca
commit fa8ab19dfd
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Widgets/Logic/GlobalChatLogic.cs
View File

@@ -80,7 +80,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var color = message.Type == ChatMessageType.Notification ? ChromeMetrics.Get<Color>("GlobalChatNotificationColor") var color = message.Type == ChatMessageType.Notification ? ChromeMetrics.Get<Color>("GlobalChatNotificationColor")
: ChromeMetrics.Get<Color>("GlobalChatPlayerNameColor"); : ChromeMetrics.Get<Color>("GlobalChatPlayerNameColor");
var template = (ContainerWidget)chatTemplate.Clone(); var template = (ContainerWidget)chatTemplate.Clone();
LobbyUtils.SetupChatLine(template, color, from, message.Message); LobbyUtils.SetupChatLine(template, color, message.Time, from, message.Message);
template.Id = message.UID; template.Id = message.UID;
return template; return template;

2
OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyLogic.cs
View File

@@ -567,7 +567,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
lobbyChatUnreadMessages += 1; lobbyChatUnreadMessages += 1;
var template = (ContainerWidget)chatTemplate.Clone(); var template = (ContainerWidget)chatTemplate.Clone();
LobbyUtils.SetupChatLine(template, c, from, text); LobbyUtils.SetupChatLine(template, c, DateTime.Now, from, text);
var scrolledToBottom = lobbyChatPanel.ScrolledToBottom; var scrolledToBottom = lobbyChatPanel.ScrolledToBottom;
lobbyChatPanel.AddChild(template); lobbyChatPanel.AddChild(template);

3
OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyUtils.cs
View File

@@ -542,7 +542,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
return address; return address;
} }
public static void SetupChatLine(ContainerWidget template, Color c, string from, string text) public static void SetupChatLine(ContainerWidget template, Color c, DateTime time, string from, string text)
{ {
var nameLabel = template.Get<LabelWidget>("NAME"); var nameLabel = template.Get<LabelWidget>("NAME");
var timeLabel = template.Get<LabelWidget>("TIME"); var timeLabel = template.Get<LabelWidget>("TIME");
@@ -552,7 +552,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var font = Game.Renderer.Fonts[nameLabel.Font]; var font = Game.Renderer.Fonts[nameLabel.Font];
var nameSize = font.Measure(from); var nameSize = font.Measure(from);
var time = DateTime.Now;
timeLabel.GetText = () => "{0:D2}:{1:D2}".F(time.Hour, time.Minute); timeLabel.GetText = () => "{0:D2}:{1:D2}".F(time.Hour, time.Minute);
nameLabel.GetColor = () => c; nameLabel.GetColor = () => c;