tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Colors the chatselector in the chatcolor (#3960)

Browse Source 
Co-authored-by: Paul <ritter.paul1+git@googlemail.com>
This commit is contained in:
Paul Ritter
2021-05-10 19:49:12 +02:00
committed by GitHub
parent 7330ed5087
commit add711114c
3 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Client/Chat/ChatBox.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Linq;
@@ -454,6 +454,7 @@ namespace Content.Client.Chat
{
SelectedChannel = toSelect;
_channelSelector.Text = ChannelSelectorName(toSelect);
_channelSelector.Modulate = ChatHelper.ChatColor(toSelect);
return true;
}
// keep current setting

11
Content.Client/Chat/ChatManager.cs
View File

@@ -3,6 +3,7 @@ using System.Collections.Generic;
using Content.Client.Administration;
using Content.Client.GameObjects.Components.Observer;
using Content.Client.Interfaces.Chat;
using Content.Client.Utility;
using Content.Shared.Administration;
using Content.Shared.Chat;
using Robust.Client.Console;
@@ -366,15 +367,7 @@ namespace Content.Client.Chat
}
else
{
color = message.Channel switch
{
ChatChannel.Server => Color.Orange,
ChatChannel.Radio => Color.Green,
ChatChannel.OOC => Color.LightSkyBlue,
ChatChannel.Dead => Color.MediumPurple,
ChatChannel.AdminChat => Color.Red,
_ => color
};
color = ChatHelper.ChatColor(message.Channel);
}
if (CurrentChatBox == null) return;

19
Content.Client/Utility/ChatHelper.cs Normal file
View File

@@ -0,0 +1,19 @@
using Content.Shared.Chat;
using Robust.Shared.Maths;
namespace Content.Client.Utility
{
public class ChatHelper
{
public static Color ChatColor(ChatChannel channel) =>
channel switch
{
ChatChannel.Server => Color.Orange,
ChatChannel.Radio => Color.Green,
ChatChannel.OOC => Color.LightSkyBlue,
ChatChannel.Dead => Color.MediumPurple,
ChatChannel.AdminChat => Color.Red,
_ => Color.DarkGray
};
}
}