]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Wrap objective briefing text (#24244)
authorKevin Zheng <kevinz5000@gmail.com>
Thu, 18 Jan 2024 22:25:40 +0000 (14:25 -0800)
committerGitHub <noreply@github.com>
Thu, 18 Jan 2024 22:25:40 +0000 (09:25 +1100)
Content.Client/UserInterface/Systems/Character/CharacterUIController.cs
Content.Client/UserInterface/Systems/Objectives/Controls/ObjectiveBriefingControl.xaml

index 5c085b19664481dfb9745bb2c238db6174f695a2..88edb6a4f12e2a23bd67552bdf79d1a9a5cb8cac 100644 (file)
@@ -149,7 +149,10 @@ public sealed class CharacterUIController : UIController, IOnStateEntered<Gamepl
         if (briefing != null)
         {
             var briefingControl = new ObjectiveBriefingControl();
-            briefingControl.Label.Text = briefing;
+            var text = new FormattedMessage();
+            text.PushColor(Color.Yellow);
+            text.AddText(briefing);
+            briefingControl.Label.SetMessage(text);
             _window.Objectives.AddChild(briefingControl);
         }
 
index 5b49c0e3a7fd7aec0a2cd85be56fa3172be34f44..450f4e782cfd14e2d703f4fbd1d385105ed622cb 100644 (file)
@@ -2,5 +2,5 @@
     xmlns="https://spacestation14.io"
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Systems.Objectives.Controls"
     Orientation="Horizontal">
-    <Label Name="Label" Access="Public" Modulate="#FFFF00"/>
+    <RichTextLabel Name="Label" Access="Public" SetWidth="325" HorizontalAlignment="Left"/>
 </controls:ObjectiveBriefingControl>