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

13
Content.Client/Body/UI/BodyScannerDisplay.cs
View File

@@ -8,6 +8,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;
using static Robust.Client.UserInterface.Controls.ItemList;
namespace Content.Client.Body.UI
@@ -25,8 +26,9 @@ namespace Content.Client.Body.UI
Owner = owner;
Title = Loc.GetString("body-scanner-display-title");
var hSplit = new HBoxContainer
var hSplit = new BoxContainer
{
Orientation = LayoutOrientation.Horizontal,
Children =
{
// Left half
@@ -39,20 +41,23 @@ namespace Content.Client.Body.UI
}
},
// Right half
new VBoxContainer
new BoxContainer
{
Orientation = LayoutOrientation.Vertical,
HorizontalExpand = true,
Children =
{
// Top half of the right half
new VBoxContainer
new BoxContainer
{
Orientation = LayoutOrientation.Vertical,
VerticalExpand = true,
Children =
{
(BodyPartLabel = new Label()),
new HBoxContainer
new BoxContainer
{
Orientation = LayoutOrientation.Horizontal,
Children =
{
new Label

12
Content.Client/Body/UI/SurgeryWindow.cs
View File

@@ -5,6 +5,7 @@ using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
using Robust.Shared.Localization;
using Robust.Shared.Maths;
using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Body.UI
{
@@ -12,7 +13,7 @@ namespace Content.Client.Body.UI
{
public delegate void OptionSelectedCallback(int selectedOptionData);
private readonly VBoxContainer _optionsBox;
private readonly BoxContainer _optionsBox;
private OptionSelectedCallback? _optionSelectedCallback;
public SurgeryWindow()
@@ -21,8 +22,9 @@ namespace Content.Client.Body.UI
Title = Loc.GetString("surgery-window-title");
RectClipContent = true;
var vSplitContainer = new VBoxContainer
var vSplitContainer = new BoxContainer
{
Orientation = LayoutOrientation.Vertical,
Children =
{
new ScrollContainer
@@ -33,8 +35,9 @@ namespace Content.Client.Body.UI
VScrollEnabled = true,
Children =
{
(_optionsBox = new VBoxContainer
(_optionsBox = new BoxContainer
{
Orientation = LayoutOrientation.Vertical,
HorizontalExpand = true
})
}
@@ -94,8 +97,9 @@ namespace Content.Client.Body.UI
AddChild(Button);
AddChild(new HBoxContainer
AddChild(new BoxContainer
{
Orientation = LayoutOrientation.Horizontal,
Children =
{
(SpriteView = new SpriteView