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

Replace most VBox/HBoxContainers with BoxContainers (#4274)

Browse Source
This commit is contained in:
Visne
2021-07-18 18:39:31 +02:00
committed by GitHub
parent 0d1af2c5ff
commit bf493c39b7
101 changed files with 1143 additions and 567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Client/Ghost/GhostGui.cs
View File

@@ -7,6 +7,7 @@ using Robust.Client.UserInterface.CustomControls;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Ghost
{
@@ -43,8 +44,9 @@ namespace Content.Client.Ghost
_ghostRoles.OnPressed += _ => IoCManager.Resolve<IClientConsoleHost>()
.RemoteExecuteCommand(null, "ghostroles");
AddChild(new HBoxContainer
AddChild(new BoxContainer
{
Orientation = LayoutOrientation.Horizontal,
Children =
{
_returnToBody,
@@ -76,7 +78,7 @@ namespace Content.Client.Ghost
private readonly GhostComponent _owner;
private readonly IEntityNetworkManager _netManager;
private readonly VBoxContainer _buttonContainer;
private readonly BoxContainer _buttonContainer;
public List<string> Locations { get; set; } = new();
@@ -89,8 +91,9 @@ namespace Content.Client.Ghost
_owner = owner;
_netManager = netManager;
_buttonContainer = new VBoxContainer()
_buttonContainer = new BoxContainer
{
Orientation = LayoutOrientation.Vertical,
VerticalExpand = true,
SeparationOverride = 5,

8
Content.Client/Ghost/Roles/UI/GhostRolesEntry.xaml
View File

@@ -1,9 +1,9 @@
<VBoxContainer
<BoxContainer Orientation="Vertical"
xmlns="https://spacestation14.io">
<RichTextLabel Name="Title" />
<HBoxContainer SeparationOverride="10">
<BoxContainer Orientation="Horizontal" SeparationOverride="10">
<RichTextLabel Name="Description" HorizontalExpand="True" />
<Button Name="RequestButton" Text="Request" TextAlign="Center" SizeFlagsHorizontal="ShrinkEnd" />
</HBoxContainer>
</VBoxContainer>
</BoxContainer>
</BoxContainer>

2
Content.Client/Ghost/Roles/UI/GhostRolesWindow.xaml
View File

@@ -4,7 +4,7 @@
<Label Text="There are currently no available ghost roles." />
</CenterContainer>
<ScrollContainer HorizontalExpand="True" VerticalExpand="True">
<VBoxContainer Name="EntryContainer" HorizontalExpand="True" VerticalExpand="True" />
<BoxContainer Orientation="Vertical" Name="EntryContainer" HorizontalExpand="True" VerticalExpand="True" />
</ScrollContainer>
</SS14Window>

24
Content.Client/Ghost/Roles/UI/MakeGhostRoleWindow.xaml
View File

@@ -1,26 +1,26 @@
<SS14Window Title="Make Ghost Role"
xmlns="https://spacestation14.io">
<VBoxContainer>
<HBoxContainer>
<BoxContainer Orientation="Vertical">
<BoxContainer Orientation="Horizontal">
<Label Name="RoleEntityLabel" Text="Entity" />
<Label Name="RoleEntity" Text="" />
</HBoxContainer>
<HBoxContainer>
</BoxContainer>
<BoxContainer Orientation="Horizontal">
<Label Name="RoleNameLabel" Text="Role Name" />
<LineEdit Name="RoleName" HorizontalExpand="True" />
</HBoxContainer>
<HBoxContainer>
</BoxContainer>
<BoxContainer Orientation="Horizontal">
<Label Name="RoleDescriptionLabel" Text="Role Description" />
<LineEdit Name="RoleDescription" HorizontalExpand="True" />
</HBoxContainer>
<HBoxContainer>
</BoxContainer>
<BoxContainer Orientation="Horizontal">
<Label Name="MakeSentientLabel" Text="Make Sentient" />
<CheckBox Name="MakeSentientCheckbox" />
</HBoxContainer>
<HBoxContainer>
</BoxContainer>
<BoxContainer Orientation="Horizontal">
<Button Name="MakeButton" Text="Make" />
</HBoxContainer>
</VBoxContainer>
</BoxContainer>
</BoxContainer>
</SS14Window>