Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert Rich text (#5848)

Browse Source
This commit is contained in:
Paul Ritter
2021-12-20 12:42:42 +01:00
committed by GitHub
parent e3a1b2b37b
commit cc57d1380c
60 changed files with 212 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Client/Chat/Managers/ChatManager.cs
View File

@@ -21,7 +21,6 @@ using Robust.Shared.Log;
using Robust.Shared.Network;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
using Robust.Shared.Utility.Markup;
namespace Content.Client.Chat.Managers
{
@@ -421,7 +420,7 @@ namespace Content.Client.Chat.Managers
return;
}
var messages = SplitMessage(Basic.RenderMarkup(msg.Message).ToString());
var messages = SplitMessage(FormattedMessage.RemoveMarkup(msg.Message));
foreach (var message in messages)
{

9
Content.Client/Chat/UI/ChatBox.xaml.cs
View File

@@ -18,7 +18,6 @@ using Robust.Shared.Localization;
using Robust.Shared.Log;
using Robust.Shared.Maths;
using Robust.Shared.Utility;
using Robust.Shared.Utility.Markup;
namespace Content.Client.Chat.UI
{
@@ -396,7 +395,7 @@ namespace Content.Client.Chat.UI
private void WriteChatMessage(StoredChatMessage message)
{
var messageText = Basic.EscapeText(message.Message);
var messageText = FormattedMessage.EscapeText(message.Message);
if (!string.IsNullOrEmpty(message.MessageWrap))
{
messageText = string.Format(message.MessageWrap, messageText);
@@ -503,7 +502,11 @@ namespace Content.Client.Chat.UI
{
DebugTools.Assert(!Disposed);
Contents.AddMessage(Basic.RenderMarkup(message, new Section{Color=color.ToArgb()}));
var formatted = new FormattedMessage(3);
formatted.PushColor(color);
formatted.AddMarkup(message);
formatted.Pop();
Contents.AddMessage(formatted);
}
private void Input_OnTextEntered(LineEdit.LineEditEventArgs args)