tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests 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

36
Content.Client/Wires/UI/WiresMenu.cs
View File

@@ -15,6 +15,7 @@ using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Maths;
using static Content.Shared.Wires.SharedWiresComponent;
using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Wires.UI
{
@@ -66,8 +67,9 @@ namespace Content.Client.Wires.UI
MouseFilter = MouseFilterMode.Pass
};
var shadow = new HBoxContainer
var shadow = new BoxContainer
{
Orientation = LayoutOrientation.Horizontal,
Children =
{
new PanelContainer
@@ -90,8 +92,16 @@ namespace Content.Client.Wires.UI
}
};
var wrappingHBox = new HBoxContainer();
_wiresHBox = new HBoxContainer {SeparationOverride = 4, VerticalAlignment = VAlignment.Bottom};
var wrappingHBox = new BoxContainer
{
Orientation = LayoutOrientation.Horizontal
};
_wiresHBox = new BoxContainer
{
Orientation = LayoutOrientation.Horizontal,
SeparationOverride = 4,
VerticalAlignment = VAlignment.Bottom
};
wrappingHBox.AddChild(new Control {MinSize = (20, 0)});
wrappingHBox.AddChild(_wiresHBox);
@@ -123,11 +133,15 @@ namespace Content.Client.Wires.UI
LayoutContainer.SetAnchorPreset(bottomWrap, LayoutContainer.LayoutPreset.VerticalCenterWide);
LayoutContainer.SetGrowHorizontal(bottomWrap, LayoutContainer.GrowDirection.Both);
var topContainerWrap = new VBoxContainer
var topContainerWrap = new BoxContainer
{
Orientation = LayoutOrientation.Vertical,
Children =
{
(_topContainer = new VBoxContainer()),
(_topContainer = new BoxContainer
{
Orientation = LayoutOrientation.Vertical
}),
new Control {MinSize = (0, 110)}
}
};
@@ -140,8 +154,9 @@ namespace Content.Client.Wires.UI
var fontSmall = _resourceCache.GetFont("/Fonts/Boxfont-round/Boxfont Round.ttf", 10);
Button helpButton;
var topRow = new HBoxContainer
var topRow = new BoxContainer
{
Orientation = LayoutOrientation.Horizontal,
Margin = new Thickness(4, 2, 12, 2),
Children =
{
@@ -188,8 +203,9 @@ namespace Content.Client.Wires.UI
PanelOverride = new StyleBoxFlat {BackgroundColor = Color.FromHex("#202025")},
Children =
{
new HBoxContainer
new BoxContainer
{
Orientation = LayoutOrientation.Horizontal,
Children =
{
(_statusContainer = new GridContainer
@@ -553,7 +569,11 @@ namespace Content.Client.Wires.UI
var font = resourceCache.GetFont("/Fonts/Boxfont-round/Boxfont Round.ttf", 12);
var hBox = new HBoxContainer {SeparationOverride = 4};
var hBox = new BoxContainer
{
Orientation = LayoutOrientation.Horizontal,
SeparationOverride = 4
};
hBox.AddChild(new Label
{
Text = data.Text,