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

21
Content.Client/Power/APC/ApcBoundUserInterface.cs
View File

@@ -8,6 +8,7 @@ using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
using Robust.Shared.GameObjects;
using Robust.Shared.Maths;
using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Power.APC
{
@@ -143,19 +144,28 @@ namespace Content.Client.Power.APC
public ApcWindow()
{
Title = "APC";
var rows = new VBoxContainer();
var rows = new BoxContainer
{
Orientation = LayoutOrientation.Vertical
};
var statusHeader = new Label {Text = "Power Status: "};
rows.AddChild(statusHeader);
var breaker = new HBoxContainer();
var breaker = new BoxContainer
{
Orientation = LayoutOrientation.Horizontal
};
var breakerLabel = new Label {Text = "Main Breaker: "};
BreakerButton = new CheckButton {Text = "Toggle"};
breaker.AddChild(breakerLabel);
breaker.AddChild(BreakerButton);
rows.AddChild(breaker);
var externalStatus = new HBoxContainer();
var externalStatus = new BoxContainer
{
Orientation = LayoutOrientation.Horizontal
};
var externalStatusLabel = new Label {Text = "External Power: "};
ExternalPowerStateLabel = new Label {Text = "Good"};
ExternalPowerStateLabel.SetOnlyStyleClass(StyleNano.StyleClassPowerStateGood);
@@ -163,7 +173,10 @@ namespace Content.Client.Power.APC
externalStatus.AddChild(ExternalPowerStateLabel);
rows.AddChild(externalStatus);
var charge = new HBoxContainer();
var charge = new BoxContainer
{
Orientation = LayoutOrientation.Horizontal
};
var chargeLabel = new Label {Text = "Charge:"};
ChargeBar = new ProgressBar
{

4
Content.Client/Power/SolarControlWindow.xaml
View File

@@ -2,7 +2,7 @@
xmlns:scc="clr-namespace:Content.Client.GameObjects.Components.Power"
Title="{Loc 'solar-control-window-title'}"
Resizable="False">
<HBoxContainer>
<BoxContainer Orientation="Horizontal">
<GridContainer Columns="2">
<!--
little secret: the reason I put the values
@@ -27,6 +27,6 @@
<Label Text="{Loc 'solar-control-window-press-enter-to-confirm'}"/><Label Text=""/>
</GridContainer>
<scc:SolarControlNotARadar Name="NotARadar"/>
</HBoxContainer>
</BoxContainer>
</SS14Window>