Revert "Rich text redux (space-wizards#2213)"

This reverts commit 2a8887d.
PaulRitter · Dec 20, 2021 · b6f623a · b6f623a
1 parent fd2712b
commit b6f623a
Show file tree

Hide file tree

Showing 26 changed files with 585 additions and 1,208 deletions.
diff --git a/Robust.Client/Console/Commands/Debug.cs b/Robust.Client/Console/Commands/Debug.cs
@@ -557,12 +557,12 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
             vBox.AddChild(tree);
 
             var rich = new RichTextLabel();
-            var message = new FormattedMessage.Builder();
+            var message = new FormattedMessage();
             message.AddText("Foo\n");
             message.PushColor(Color.Red);
             message.AddText("Bar");
             message.Pop();
-            rich.SetMessage(message.Build());
+            rich.SetMessage(message);
             vBox.AddChild(rich);
 
             var itemList = new ItemList();

diff --git a/Robust.Client/Console/Completions.cs b/Robust.Client/Console/Completions.cs
@@ -83,7 +83,7 @@ public Entry(LiteResult result)
             {
                 MouseFilter = MouseFilterMode.Stop;
                 Result = result;
-                var compl = new FormattedMessage.Builder();
+                var compl = new FormattedMessage();
                 var dim = Color.FromHsl((0f, 0f, 0.8f, 1f));
 
                 // warning: ew ahead
@@ -120,7 +120,7 @@ public Entry(LiteResult result)
                     compl.PushColor(Color.LightSlateGray);
                     compl.AddText(Result.InlineDescription);
                 }
-                SetMessage(compl.Build());
+                SetMessage(compl);
             }
         }
     }

diff --git a/Robust.Client/Console/ScriptClient.ScriptConsoleServer.cs b/Robust.Client/Console/ScriptClient.ScriptConsoleServer.cs
@@ -95,11 +95,11 @@ public void ReceiveResponse(MsgScriptResponse response)
                 _linesEntered = 0;
 
                 // Echo entered script.
-                var echoMessage = new FormattedMessage.Builder();
+                var echoMessage = new FormattedMessage();
                 echoMessage.PushColor(Color.FromHex("#D4D4D4"));
                 echoMessage.AddText("> ");
                 echoMessage.AddMessage(response.Echo);
-                OutputPanel.AddMessage(echoMessage.Build());
+                OutputPanel.AddMessage(echoMessage);
 
                 OutputPanel.AddMessage(response.Response);
 

diff --git a/Robust.Client/Console/ScriptConsoleClient.cs b/Robust.Client/Console/ScriptConsoleClient.cs
@@ -128,12 +128,12 @@ protected override async void Run()
             newScript.Compile();
 
             // Echo entered script.
-            var echoMessage = new FormattedMessage.Builder();
+            var echoMessage = new FormattedMessage();
             echoMessage.PushColor(Color.FromHex("#D4D4D4"));
             echoMessage.AddText("> ");
             ScriptInstanceShared.AddWithSyntaxHighlighting(newScript, echoMessage, code, _highlightWorkspace);
 
-            OutputPanel.AddMessage(echoMessage.Build());
+            OutputPanel.AddMessage(echoMessage);
 
             try
             {
@@ -148,7 +148,7 @@ protected override async void Run()
             }
             catch (CompilationErrorException e)
             {
-                var msg = new FormattedMessage.Builder();
+                var msg = new FormattedMessage();
 
                 msg.PushColor(Color.Crimson);
 
@@ -158,7 +158,7 @@ protected override async void Run()
                     msg.AddText("\n");
                 }
 
-                OutputPanel.AddMessage(msg.Build());
+                OutputPanel.AddMessage(msg);
                 OutputPanel.AddText(">");
 
                 PromptAutoImports(e.Diagnostics, code);
@@ -167,16 +167,16 @@ protected override async void Run()
 
             if (_state.Exception != null)
             {
-                var msg = new FormattedMessage.Builder();
+                var msg = new FormattedMessage();
                 msg.PushColor(Color.Crimson);
                 msg.AddText(CSharpObjectFormatter.Instance.FormatException(_state.Exception));
-                OutputPanel.AddMessage(msg.Build());
+                OutputPanel.AddMessage(msg);
             }
             else if (ScriptInstanceShared.HasReturnValue(newScript))
             {
-                var msg = new FormattedMessage.Builder();
+                var msg = new FormattedMessage();
                 msg.AddText(ScriptInstanceShared.SafeFormat(_state.ReturnValue));
-                OutputPanel.AddMessage(msg.Build());
+                OutputPanel.AddMessage(msg);
             }
 
             OutputPanel.AddText(">");

diff --git a/Robust.Client/Graphics/FontLibrary.cs b/Robust.Client/Graphics/FontLibrary.cs
diff --git a/Robust.Client/Log/DebugConsoleLogHandler.cs b/Robust.Client/Log/DebugConsoleLogHandler.cs
@@ -23,7 +23,7 @@ public void Log(string sawmillName, LogEvent message)
             if (sawmillName == "CON")
                 return;
 
-            var formatted = new FormattedMessage.Builder();
+            var formatted = new FormattedMessage(8);
             var robustLevel = message.Level.ToRobust();
             formatted.PushColor(Color.DarkGray);
             formatted.AddText("[");
@@ -32,15 +32,13 @@ public void Log(string sawmillName, LogEvent message)
             formatted.Pop();
             formatted.AddText($"] {sawmillName}: ");
             formatted.Pop();
-            formatted.PushColor(Color.LightGray);
             formatted.AddText(message.RenderMessage());
-            formatted.Pop();
             if (message.Exception != null)
             {
                 formatted.AddText("\n");
                 formatted.AddText(message.Exception.ToString());
             }
-            Console.AddFormattedLine(formatted.Build());
+            Console.AddFormattedLine(formatted);
         }
 
         private static Color LogLevelToColor(LogLevel level)

diff --git a/Robust.Client/UserInterface/Controls/ItemList.cs b/Robust.Client/UserInterface/Controls/ItemList.cs
@@ -235,17 +235,12 @@ public Font ActualFont
         {
             get
             {
-                TryGetStyleProperty<FontClass>("font", out var font);
-                if (TryGetStyleProperty<IFontLibrary>("font-library", out var flib))
+                if (TryGetStyleProperty<Font>("font", out var font))
                 {
-                    return flib.StartFont(font).Current;
+                    return font;
                 }
 
-                return UserInterfaceManager
-                    .ThemeDefaults
-                    .DefaultFontLibrary
-                    .StartFont(font)
-                    .Current;
+                return UserInterfaceManager.ThemeDefaults.DefaultFont;
             }
         }
 

diff --git a/Robust.Client/UserInterface/Controls/Label.cs b/Robust.Client/UserInterface/Controls/Label.cs
@@ -83,10 +83,9 @@ private Font ActualFont
                     return FontOverride;
                 }
 
-                TryGetStyleProperty<FontClass>(StylePropertyFont, out var font);
-                if (TryGetStyleProperty<IFontLibrary>("font-library", out var flib))
+                if (TryGetStyleProperty<Font>(StylePropertyFont, out var font))
                 {
-                    return flib.StartFont(font).Current;
+                    return font;
                 }
 
                 return UserInterfaceManager.ThemeDefaults.LabelFont;

diff --git a/Robust.Client/UserInterface/Controls/LineEdit.cs b/Robust.Client/UserInterface/Controls/LineEdit.cs
@@ -667,10 +667,9 @@ protected internal override void KeyboardFocusExited()
         [Pure]
         private Font _getFont()
         {
-            TryGetStyleProperty<FontClass>("font", out var font);
-            if (TryGetStyleProperty<IFontLibrary>("font-library", out var flib))
+            if (TryGetStyleProperty<Font>("font", out var font))
             {
-                return flib.StartFont(font).Current;
+                return font;
             }
 
             return UserInterfaceManager.ThemeDefaults.DefaultFont;