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

reformatted syndicate objectives for readability (#17745)

Browse Source 
* reformatted syndicate objectives for readability

* used richtextlabels instead of labels, narrowed window size back to original
This commit is contained in:
Justin Trotter
2023-07-04 19:33:11 -05:00
committed by GitHub
parent c8569d906c
commit 72b6c2b54b
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Client/UserInterface/Systems/Character/CharacterUIController.cs
View File

@@ -1,4 +1,4 @@
using Content.Client.CharacterInfo; using Content.Client.CharacterInfo;
using Content.Client.Gameplay; using Content.Client.Gameplay;
using Content.Client.UserInterface.Controls; using Content.Client.UserInterface.Controls;
using Content.Client.UserInterface.Systems.Character.Controls; using Content.Client.UserInterface.Systems.Character.Controls;
@@ -125,9 +125,13 @@ public sealed class CharacterUIController : UIController, IOnStateEntered<Gamepl
var conditionControl = new ObjectiveConditionsControl(); var conditionControl = new ObjectiveConditionsControl();
conditionControl.ProgressTexture.Texture = condition.SpriteSpecifier.Frame0(); conditionControl.ProgressTexture.Texture = condition.SpriteSpecifier.Frame0();
conditionControl.ProgressTexture.Progress = condition.Progress; conditionControl.ProgressTexture.Progress = condition.Progress;
var titleMessage = new FormattedMessage();
var descriptionMessage = new FormattedMessage();
titleMessage.AddText(condition.Title);
descriptionMessage.AddText(condition.Description);
conditionControl.Title.Text = condition.Title; conditionControl.Title.SetMessage(titleMessage);
conditionControl.Description.Text = condition.Description; conditionControl.Description.SetMessage(descriptionMessage);
objectiveControl.AddChild(conditionControl); objectiveControl.AddChild(conditionControl);
} }

2
Content.Client/UserInterface/Systems/Character/Windows/CharacterWindow.xaml
View File

@@ -1,4 +1,4 @@
<windows:CharacterWindow <windows:CharacterWindow
xmlns="https://spacestation14.io" xmlns="https://spacestation14.io"
xmlns:cc="clr-namespace:Content.Client.UserInterface.Controls" xmlns:cc="clr-namespace:Content.Client.UserInterface.Controls"
xmlns:windows="clr-namespace:Content.Client.UserInterface.Systems.Character.Windows" xmlns:windows="clr-namespace:Content.Client.UserInterface.Systems.Character.Windows"

8
Content.Client/UserInterface/Systems/Objectives/Controls/ObjectiveConditionsControl.xaml
View File

@@ -1,12 +1,12 @@
<controls:ObjectiveConditionsControl <controls:ObjectiveConditionsControl
xmlns="https://spacestation14.io" xmlns="https://spacestation14.io"
xmlns:cc="clr-namespace:Content.Client.UserInterface.Controls" xmlns:cc="clr-namespace:Content.Client.UserInterface.Controls"
xmlns:controls="clr-namespace:Content.Client.UserInterface.Systems.Objectives.Controls" xmlns:controls="clr-namespace:Content.Client.UserInterface.Systems.Objectives.Controls"
Orientation="Horizontal"> Orientation="Horizontal">
<cc:ProgressTextureRect Name="ProgressTexture" VerticalAlignment="Center" Access="Public"/> <cc:ProgressTextureRect Name="ProgressTexture" VerticalAlignment="Top" Access="Public" Margin="0 8 0 0"/>
<Control MinSize="10 0"/> <Control MinSize="10 0"/>
<BoxContainer Orientation="Vertical"> <BoxContainer Orientation="Vertical">
<Label Name="Title" Access="Public"/> <RichTextLabel Name="Title" Access="Public" SetWidth="325" HorizontalAlignment="Left"/>
<Label Name="Description" Access="Public"/> <RichTextLabel Name="Description" Access="Public" SetWidth="325" HorizontalAlignment="Left"/>
</BoxContainer> </BoxContainer>
</controls:ObjectiveConditionsControl> </controls:ObjectiveConditionsControl>