diff --git a/Content.Client/AI/ClientAiDebugSystem.cs b/Content.Client/AI/ClientAiDebugSystem.cs
index e60014f48f..fb3a657c4b 100644
--- a/Content.Client/AI/ClientAiDebugSystem.cs
+++ b/Content.Client/AI/ClientAiDebugSystem.cs
@@ -8,6 +8,7 @@ using Robust.Client.UserInterface.Controls;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.AI
{
@@ -169,8 +170,9 @@ namespace Content.Client.AI
MouseFilter = Control.MouseFilterMode.Ignore,
};
- var vBox = new VBoxContainer()
+ var vBox = new BoxContainer()
{
+ Orientation = LayoutOrientation.Vertical,
SeparationOverride = 15,
Children = {actionLabel, pathfindingLabel},
};
diff --git a/Content.Client/AME/UI/AMEWindow.cs b/Content.Client/AME/UI/AMEWindow.cs
index 0b56471431..e9104e6f67 100644
--- a/Content.Client/AME/UI/AMEWindow.cs
+++ b/Content.Client/AME/UI/AMEWindow.cs
@@ -6,6 +6,7 @@ using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using static Content.Shared.AME.SharedAMEControllerComponent;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.AME.UI
{
@@ -30,58 +31,66 @@ namespace Content.Client.AME.UI
MinSize = SetSize = (250, 250);
- Contents.AddChild(new VBoxContainer
+ Contents.AddChild(new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
Children =
{
- new HBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
new Label {Text = Loc.GetString("ame-window-engine-status-label") + " "},
(InjectionStatus = new Label {Text = Loc.GetString("ame-window-engine-injection-status-not-injecting-label")})
}
},
- new HBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
(ToggleInjection = new Button {Text = Loc.GetString("ame-window-toggle-injection-button"), StyleClasses = {StyleBase.ButtonOpenBoth}, Disabled = true}),
}
},
- new HBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
new Label {Text = Loc.GetString("ame-window-fuel-status-label") + " "},
(FuelAmount = new Label {Text = Loc.GetString("ame-window-fuel-not-inserted-text")})
}
},
- new HBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
(EjectButton = new Button {Text = Loc.GetString("ame-window-eject-button"), StyleClasses = {StyleBase.ButtonOpenBoth}, Disabled = true}),
}
},
- new HBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
new Label {Text = Loc.GetString("ame-window-injection-amount-label") + " "},
(InjectionAmount = new Label {Text = "0"})
}
},
- new HBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
(IncreaseFuelButton = new Button {Text = Loc.GetString("ame-window-increase-fuel-button"), StyleClasses = {StyleBase.ButtonOpenRight}}),
(DecreaseFuelButton = new Button {Text = Loc.GetString("ame-window-decrease-fuel-button"), StyleClasses = {StyleBase.ButtonOpenLeft}}),
}
},
- new HBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
new Label { Text = Loc.GetString("ame-window-core-count-label") + " "},
diff --git a/Content.Client/Access/UI/IdCardConsoleWindow.cs b/Content.Client/Access/UI/IdCardConsoleWindow.cs
index 450aa0ebdd..4c3093baa2 100644
--- a/Content.Client/Access/UI/IdCardConsoleWindow.cs
+++ b/Content.Client/Access/UI/IdCardConsoleWindow.cs
@@ -8,6 +8,7 @@ using Robust.Shared.Localization;
using Robust.Shared.Maths;
using Robust.Shared.Prototypes;
using static Content.Shared.Access.SharedIdCardConsoleComponent;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Access.UI
{
@@ -38,7 +39,10 @@ namespace Content.Client.Access.UI
{
MinSize = SetSize = (650, 290);
_owner = owner;
- var vBox = new VBoxContainer();
+ var vBox = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Vertical
+ };
vBox.AddChild(new GridContainer
{
diff --git a/Content.Client/Actions/UI/ActionAlertTooltip.cs b/Content.Client/Actions/UI/ActionAlertTooltip.cs
index 8ebb9c8642..b64faa56b1 100644
--- a/Content.Client/Actions/UI/ActionAlertTooltip.cs
+++ b/Content.Client/Actions/UI/ActionAlertTooltip.cs
@@ -4,6 +4,7 @@ using Robust.Client.UserInterface.Controls;
using Robust.Shared.IoC;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Actions.UI
{
@@ -28,8 +29,12 @@ namespace Content.Client.Actions.UI
SetOnlyStyleClass(StyleNano.StyleClassTooltipPanel);
- VBoxContainer vbox;
- AddChild(vbox = new VBoxContainer {RectClipContent = true});
+ BoxContainer vbox;
+ AddChild(vbox = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Vertical,
+ RectClipContent = true
+ });
var nameLabel = new RichTextLabel
{
MaxWidth = TooltipTextMaxWidth,
diff --git a/Content.Client/Actions/UI/ActionMenu.cs b/Content.Client/Actions/UI/ActionMenu.cs
index f935adfd3c..bb7f996ad0 100644
--- a/Content.Client/Actions/UI/ActionMenu.cs
+++ b/Content.Client/Actions/UI/ActionMenu.cs
@@ -19,6 +19,7 @@ using Robust.Shared.Localization;
using Robust.Shared.Log;
using Robust.Shared.Timing;
using static Robust.Client.UserInterface.Controls.BaseButton;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Actions.UI
{
@@ -71,12 +72,14 @@ namespace Content.Client.Actions.UI
Title = Loc.GetString("ui-actionmenu-title");
MinSize = (300, 300);
- Contents.AddChild(new VBoxContainer
+ Contents.AddChild(new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
Children =
{
- new HBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
(_searchBar = new LineEdit
diff --git a/Content.Client/Actions/UI/ActionSlot.cs b/Content.Client/Actions/UI/ActionSlot.cs
index 29b4b48b82..36702eddd9 100644
--- a/Content.Client/Actions/UI/ActionSlot.cs
+++ b/Content.Client/Actions/UI/ActionSlot.cs
@@ -16,6 +16,7 @@ using Robust.Shared.Localization;
using Robust.Shared.Maths;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Actions.UI
{
@@ -174,8 +175,9 @@ namespace Content.Client.Actions.UI
_cooldownGraphic = new CooldownGraphic {Progress = 0, Visible = false};
// padding to the left of the number to shift it right
- var paddingBox = new HBoxContainer()
+ var paddingBox = new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
HorizontalExpand = true,
VerticalExpand = true,
MinSize = (64, 64)
@@ -187,8 +189,9 @@ namespace Content.Client.Actions.UI
paddingBox.AddChild(_number);
// padding to the left of the small icon
- var paddingBoxItemIcon = new HBoxContainer()
+ var paddingBoxItemIcon = new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
HorizontalExpand = true,
VerticalExpand = true,
MinSize = (64, 64)
diff --git a/Content.Client/Actions/UI/ActionsUI.cs b/Content.Client/Actions/UI/ActionsUI.cs
index 7c9b5ca86b..7544bece52 100644
--- a/Content.Client/Actions/UI/ActionsUI.cs
+++ b/Content.Client/Actions/UI/ActionsUI.cs
@@ -18,6 +18,7 @@ using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Log;
using Robust.Shared.Timing;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Actions.UI
{
@@ -42,7 +43,7 @@ namespace Content.Client.Actions.UI
private readonly Label _loadoutNumber;
private readonly Texture _lockTexture;
private readonly Texture _unlockTexture;
- private readonly HBoxContainer _loadoutContainer;
+ private readonly BoxContainer _loadoutContainer;
private readonly TextureRect _dragShadow;
@@ -108,15 +109,17 @@ namespace Content.Client.Actions.UI
};
AddChild(panelContainer);
- var hotbarContainer = new VBoxContainer
+ var hotbarContainer = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
SeparationOverride = 3,
HorizontalAlignment = HAlignment.Left
};
panelContainer.AddChild(hotbarContainer);
- var settingsContainer = new HBoxContainer
+ var settingsContainer = new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
HorizontalExpand = true
};
hotbarContainer.AddChild(settingsContainer);
@@ -156,8 +159,9 @@ namespace Content.Client.Actions.UI
};
hotbarContainer.AddChild(_slotContainer);
- _loadoutContainer = new HBoxContainer
+ _loadoutContainer = new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
HorizontalExpand = true,
MouseFilter = MouseFilterMode.Stop
};
diff --git a/Content.Client/Administration/UI/AdminAddReagentUI.cs b/Content.Client/Administration/UI/AdminAddReagentUI.cs
index 397b899369..425fb16746 100644
--- a/Content.Client/Administration/UI/AdminAddReagentUI.cs
+++ b/Content.Client/Administration/UI/AdminAddReagentUI.cs
@@ -8,6 +8,7 @@ using Robust.Client.UserInterface.CustomControls;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Prototypes;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Administration.UI
{
@@ -65,8 +66,9 @@ namespace Content.Client.Administration.UI
Title = Loc.GetString("admin-add-reagent-eui-title");
- Contents.AddChild(new VBoxContainer
+ Contents.AddChild(new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
Children =
{
new GridContainer
@@ -88,8 +90,9 @@ namespace Content.Client.Administration.UI
HorizontalExpand = true,
VerticalExpand = true
},
- new HBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
(_errorLabel = new Label
diff --git a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml
index 33d5d6d535..4f64435d42 100644
--- a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml
+++ b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml
@@ -1,13 +1,13 @@
-
-
+
-
+
-
+
diff --git a/Content.Client/Administration/UI/PermissionsEui.cs b/Content.Client/Administration/UI/PermissionsEui.cs
index feaa2b751d..8aa8b32a6f 100644
--- a/Content.Client/Administration/UI/PermissionsEui.cs
+++ b/Content.Client/Administration/UI/PermissionsEui.cs
@@ -14,6 +14,7 @@ using Robust.Shared.Localization;
using Robust.Shared.Maths;
using Robust.Shared.Utility;
using static Content.Shared.Administration.PermissionsEuiMsg;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Administration.UI
{
@@ -316,15 +317,17 @@ namespace Content.Client.Administration.UI
};
AdminsList = new GridContainer {Columns = 5, VerticalExpand = true};
- var adminVBox = new VBoxContainer
+ var adminVBox = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
Children = {AdminsList, AddAdminButton},
};
TabContainer.SetTabTitle(adminVBox, Loc.GetString("permissions-eui-menu-admins-tab-title"));
AdminRanksList = new GridContainer {Columns = 3};
- var rankVBox = new VBoxContainer
+ var rankVBox = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
Children = { AdminRanksList, AddAdminRankButton}
};
TabContainer.SetTabTitle(rankVBox, Loc.GetString("permissions-eui-menu-admin-ranks-tab-title"));
@@ -451,7 +454,10 @@ namespace Content.Client.Administration.UI
FlagButtons.Add(flag, (inherit, sub, plus));
}
- var bottomButtons = new HBoxContainer();
+ var bottomButtons = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Horizontal
+ };
if (data != null)
{
// show remove button.
@@ -461,17 +467,20 @@ namespace Content.Client.Administration.UI
bottomButtons.AddChild(SaveButton);
- Contents.AddChild(new VBoxContainer
+ Contents.AddChild(new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
Children =
{
- new HBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
SeparationOverride = 2,
Children =
{
- new VBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
HorizontalExpand = true,
Children =
{
@@ -541,7 +550,10 @@ namespace Content.Client.Administration.UI
HorizontalAlignment = HAlignment.Right,
HorizontalExpand = true
};
- var flagsBox = new VBoxContainer();
+ var flagsBox = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Vertical
+ };
foreach (var flag in AdminFlagsHelper.AllFlags)
{
@@ -565,7 +577,10 @@ namespace Content.Client.Administration.UI
flagsBox.AddChild(checkBox);
}
- var bottomButtons = new HBoxContainer();
+ var bottomButtons = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Horizontal
+ };
if (data != null)
{
// show remove button.
@@ -575,8 +590,9 @@ namespace Content.Client.Administration.UI
bottomButtons.AddChild(SaveButton);
- Contents.AddChild(new VBoxContainer
+ Contents.AddChild(new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
Children =
{
NameEdit,
diff --git a/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml b/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml
index 6cdafeb1c8..efb831cd1b 100644
--- a/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml
+++ b/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml
@@ -1,15 +1,15 @@
-
-
-
+
+
-
+
-
-
+
+
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml b/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml
index 30a1cb64bf..98167d55c8 100644
--- a/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml
@@ -5,7 +5,7 @@
xmlns:at="clr-namespace:Content.Client.Administration.UI.Tabs.AdminTab"
Margin="4"
MinSize="50 50">
-
+
@@ -13,5 +13,5 @@
-
+
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml b/Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml
index 18b82ca927..d81942655a 100644
--- a/Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml
@@ -1,23 +1,23 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/KickWindow.xaml b/Content.Client/Administration/UI/Tabs/AdminTab/KickWindow.xaml
index 72d79c8a53..c1ee96cfe6 100644
--- a/Content.Client/Administration/UI/Tabs/AdminTab/KickWindow.xaml
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/KickWindow.xaml
@@ -2,13 +2,13 @@
xmlns="https://spacestation14.io"
xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
Title="{Loc Kick}" MinSize="425 272">
-
-
+
+
-
+
-
+
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml b/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml
index ef7635c599..380ee75ed4 100644
--- a/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml
@@ -2,8 +2,8 @@
xmlns="https://spacestation14.io"
xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
Title="{Loc Teleport}" MinSize="425 230">
-
+
-
+
diff --git a/Content.Client/Administration/UI/Tabs/AdminbusTab/StationEventsWindow.xaml b/Content.Client/Administration/UI/Tabs/AdminbusTab/StationEventsWindow.xaml
index 097eb0f150..709d665fb6 100644
--- a/Content.Client/Administration/UI/Tabs/AdminbusTab/StationEventsWindow.xaml
+++ b/Content.Client/Administration/UI/Tabs/AdminbusTab/StationEventsWindow.xaml
@@ -1,13 +1,13 @@
-
-
+
+
-
+
-
+
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml b/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml
index bdc9528ba8..c2857cc733 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml
@@ -1,11 +1,11 @@
-
-
+
+
-
+
-
+
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml b/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml
index d31d48dd8c..4b5f9d46e0 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml
@@ -1,31 +1,31 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml b/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml
index e06e390ba8..715653236d 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml
@@ -1,21 +1,21 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml b/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml
index 97abb3ecb7..da471f500e 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml
@@ -1,26 +1,26 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab.xaml b/Content.Client/Administration/UI/Tabs/PlayerTab.xaml
index 4cca89fb11..6c17639df7 100644
--- a/Content.Client/Administration/UI/Tabs/PlayerTab.xaml
+++ b/Content.Client/Administration/UI/Tabs/PlayerTab.xaml
@@ -1,14 +1,14 @@
-
-
+
+
-
+
-
+
-
+
diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab.xaml.cs b/Content.Client/Administration/UI/Tabs/PlayerTab.xaml.cs
index 0492e42fad..a128c9ad1b 100644
--- a/Content.Client/Administration/UI/Tabs/PlayerTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/PlayerTab.xaml.cs
@@ -9,6 +9,7 @@ using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Administration.UI.Tabs
{
@@ -40,8 +41,9 @@ namespace Content.Client.Administration.UI.Tabs
var altColor = Color.FromHex("#292B38");
var defaultColor = Color.FromHex("#2F2F3B");
- var header = new HBoxContainer
+ var header = new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
HorizontalExpand = true,
SeparationOverride = 4,
Children =
@@ -84,8 +86,9 @@ namespace Content.Client.Administration.UI.Tabs
var useAltColor = false;
foreach (var player in players)
{
- var hBox = new HBoxContainer
+ var hBox = new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
HorizontalExpand = true,
SeparationOverride = 4,
Children =
diff --git a/Content.Client/Arcade/BlockGameMenu.cs b/Content.Client/Arcade/BlockGameMenu.cs
index 0ac7329a71..ce11b1a6e4 100644
--- a/Content.Client/Arcade/BlockGameMenu.cs
+++ b/Content.Client/Arcade/BlockGameMenu.cs
@@ -14,6 +14,7 @@ using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Maths;
using Robust.Shared.Utility;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Arcade
{
@@ -28,7 +29,7 @@ namespace Content.Client.Arcade
private readonly PanelContainer _mainPanel;
- private VBoxContainer _gameRootContainer;
+ private BoxContainer _gameRootContainer;
private GridContainer _gameGrid = default!;
private GridContainer _nextBlockGrid = default!;
private GridContainer _holdBlockGrid = default!;
@@ -68,7 +69,10 @@ namespace Content.Client.Arcade
#region Game Menu
// building the game container
- _gameRootContainer = new VBoxContainer();
+ _gameRootContainer = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Vertical
+ };
_levelLabel = new Label
{
@@ -92,7 +96,10 @@ namespace Content.Client.Arcade
MinSize = new Vector2(1,10)
});
- var gameBox = new HBoxContainer();
+ var gameBox = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Horizontal
+ };
gameBox.AddChild(SetupHoldBox(backgroundTexture));
gameBox.AddChild(new Control
{
@@ -152,8 +159,9 @@ namespace Content.Client.Arcade
_menuRootContainer.AddChild(pauseMenuInnerPanel);
- var pauseMenuContainer = new VBoxContainer
+ var pauseMenuContainer = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
HorizontalAlignment = HAlignment.Center,
VerticalAlignment = VAlignment.Center
};
@@ -224,8 +232,9 @@ namespace Content.Client.Arcade
_gameOverRootContainer.AddChild(gameOverMenuInnerPanel);
- var gameOverMenuContainer = new VBoxContainer
+ var gameOverMenuContainer = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
HorizontalAlignment = HAlignment.Center,
VerticalAlignment = VAlignment.Center
};
@@ -282,8 +291,9 @@ namespace Content.Client.Arcade
_highscoresRootContainer.AddChild(menuInnerPanel);
- var menuContainer = new VBoxContainer()
+ var menuContainer = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
HorizontalAlignment = HAlignment.Center,
VerticalAlignment = VAlignment.Center
};
@@ -291,7 +301,10 @@ namespace Content.Client.Arcade
menuContainer.AddChild(new Label{Text = Loc.GetString("blockgame-menu-label-highscores")});
menuContainer.AddChild(new Control{MinSize = new Vector2(1,10)});
- var highScoreBox = new HBoxContainer();
+ var highScoreBox = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Horizontal
+ };
_localHighscoresLabel = new Label
{
diff --git a/Content.Client/Atmos/UI/GasAnalyzerMenu.cs b/Content.Client/Atmos/UI/GasAnalyzerMenu.cs
index 3c114f7d7c..86122932a4 100644
--- a/Content.Client/Atmos/UI/GasAnalyzerMenu.cs
+++ b/Content.Client/Atmos/UI/GasAnalyzerMenu.cs
@@ -10,6 +10,7 @@ using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Maths;
using static Content.Shared.Atmos.Components.SharedGasAnalyzerComponent;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Atmos.UI
{
@@ -61,11 +62,15 @@ namespace Content.Client.Atmos.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)}
}
};
@@ -78,8 +83,9 @@ namespace Content.Client.Atmos.UI
var fontSmall = resourceCache.GetFont("/Fonts/Boxfont-round/Boxfont Round.ttf", 10);
Button refreshButton;
- var topRow = new HBoxContainer
+ var topRow = new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Margin = new Thickness(4, 4, 12, 2),
Children =
{
@@ -118,8 +124,9 @@ namespace Content.Client.Atmos.UI
PanelOverride = new StyleBoxFlat { BackgroundColor = Color.FromHex("#202025") },
Children =
{
- (_statusContainer = new VBoxContainer
+ (_statusContainer = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
Margin = new Thickness(8, 8, 4, 4)
})
}
@@ -178,10 +185,17 @@ namespace Content.Client.Atmos.UI
});
// Add a table with all the gases
- var tableKey = new VBoxContainer();
- var tableVal = new VBoxContainer();
- _statusContainer.AddChild(new HBoxContainer
+ var tableKey = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical
+ };
+ var tableVal = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Vertical
+ };
+ _statusContainer.AddChild(new BoxContainer
+ {
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
tableKey,
@@ -195,8 +209,9 @@ namespace Content.Client.Atmos.UI
// This is the gas bar thingy
var height = 30;
var minSize = 24; // This basically allows gases which are too small, to be shown properly
- var gasBar = new HBoxContainer
+ var gasBar = new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
HorizontalExpand = true,
MinSize = new Vector2(0, height)
};
diff --git a/Content.Client/Atmos/UI/GasCanisterWindow.xaml b/Content.Client/Atmos/UI/GasCanisterWindow.xaml
index 6bddc2ced3..69e2599523 100644
--- a/Content.Client/Atmos/UI/GasCanisterWindow.xaml
+++ b/Content.Client/Atmos/UI/GasCanisterWindow.xaml
@@ -2,51 +2,51 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:s="clr-namespace:Content.Client.Stylesheets"
MinSize="480 400" Title="Canister">
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
-
+
+
+
diff --git a/Content.Client/Body/UI/BodyScannerDisplay.cs b/Content.Client/Body/UI/BodyScannerDisplay.cs
index 90b3436582..428a2b4516 100644
--- a/Content.Client/Body/UI/BodyScannerDisplay.cs
+++ b/Content.Client/Body/UI/BodyScannerDisplay.cs
@@ -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
diff --git a/Content.Client/Body/UI/SurgeryWindow.cs b/Content.Client/Body/UI/SurgeryWindow.cs
index ef771bab1e..9f8b18c5e0 100644
--- a/Content.Client/Body/UI/SurgeryWindow.cs
+++ b/Content.Client/Body/UI/SurgeryWindow.cs
@@ -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
diff --git a/Content.Client/Cargo/UI/CargoConsoleMenu.cs b/Content.Client/Cargo/UI/CargoConsoleMenu.cs
index 9f31c1b4c4..69a3e1a03b 100644
--- a/Content.Client/Cargo/UI/CargoConsoleMenu.cs
+++ b/Content.Client/Cargo/UI/CargoConsoleMenu.cs
@@ -10,6 +10,7 @@ using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Maths;
using static Robust.Client.UserInterface.Controls.BaseButton;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Cargo.UI
{
@@ -27,12 +28,12 @@ namespace Content.Client.Cargo.UI
private Label _pointsLabel { get; set; }
private Label _shuttleStatusLabel { get; set; }
private Label _shuttleCapacityLabel { get; set; }
- private VBoxContainer _requests { get; set; }
- private VBoxContainer _orders { get; set; }
+ private BoxContainer _requests { get; set; }
+ private BoxContainer _orders { get; set; }
private OptionButton _categories { get; set; }
private LineEdit _searchBar { get; set; }
- public VBoxContainer Products { get; set; }
+ public BoxContainer Products { get; set; }
public Button CallShuttleButton { get; set; }
public Button PermissionsButton { get; set; }
@@ -49,9 +50,15 @@ namespace Content.Client.Cargo.UI
else
Title = Loc.GetString("cargo-console-menu-title");
- var rows = new VBoxContainer();
+ var rows = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Vertical
+ };
- var accountName = new HBoxContainer();
+ var accountName = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Horizontal
+ };
var accountNameLabel = new Label {
Text = Loc.GetString("cargo-console-menu-account-name-label") + " ",
StyleClasses = { StyleNano.StyleClassLabelKeyText }
@@ -63,7 +70,10 @@ namespace Content.Client.Cargo.UI
accountName.AddChild(_accountNameLabel);
rows.AddChild(accountName);
- var points = new HBoxContainer();
+ var points = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Horizontal
+ };
var pointsLabel = new Label
{
Text = Loc.GetString("cargo-console-menu-points-label") + " ",
@@ -77,7 +87,10 @@ namespace Content.Client.Cargo.UI
points.AddChild(_pointsLabel);
rows.AddChild(points);
- var shuttleStatus = new HBoxContainer();
+ var shuttleStatus = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Horizontal
+ };
var shuttleStatusLabel = new Label
{
Text = Loc.GetString("cargo-console-menu-shuttle-status-label") + " ",
@@ -91,7 +104,10 @@ namespace Content.Client.Cargo.UI
shuttleStatus.AddChild(_shuttleStatusLabel);
rows.AddChild(shuttleStatus);
- var shuttleCapacity = new HBoxContainer();
+ var shuttleCapacity = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Horizontal
+ };
var shuttleCapacityLabel = new Label
{
Text = Loc.GetString("cargo-console-menu-order-capacity-label") + " ",
@@ -105,7 +121,10 @@ namespace Content.Client.Cargo.UI
shuttleCapacity.AddChild(_shuttleCapacityLabel);
rows.AddChild(shuttleCapacity);
- var buttons = new HBoxContainer();
+ var buttons = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Horizontal
+ };
CallShuttleButton = new Button()
{
//Text = Loc.GetString("Call Shuttle"),
@@ -122,7 +141,10 @@ namespace Content.Client.Cargo.UI
buttons.AddChild(PermissionsButton);
rows.AddChild(buttons);
- var category = new HBoxContainer();
+ var category = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Horizontal
+ };
_categories = new OptionButton
{
Prefix = Loc.GetString("cargo-console-menu-categories-label") + " ",
@@ -145,8 +167,9 @@ namespace Content.Client.Cargo.UI
VerticalExpand = true,
SizeFlagsStretchRatio = 6
};
- Products = new VBoxContainer()
+ Products = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
HorizontalExpand = true,
VerticalExpand = true
};
@@ -163,17 +186,22 @@ namespace Content.Client.Cargo.UI
{
VerticalExpand = true
};
- var rAndOVBox = new VBoxContainer();
- var requestsLabel = new Label { Text = Loc.GetString("cargo-console-menu-requests-label") };
- _requests = new VBoxContainer // replace with scroll box so that approval buttons can be added
+ var rAndOVBox = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical
+ };
+ var requestsLabel = new Label { Text = Loc.GetString("cargo-console-menu-requests-label") };
+ _requests = new BoxContainer // replace with scroll box so that approval buttons can be added
+ {
+ Orientation = LayoutOrientation.Vertical,
StyleClasses = { "transparentItemList" },
VerticalExpand = true,
SizeFlagsStretchRatio = 1,
};
var ordersLabel = new Label { Text = Loc.GetString("cargo-console-menu-orders-label") };
- _orders = new VBoxContainer
+ _orders = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
StyleClasses = { "transparentItemList" },
VerticalExpand = true,
SizeFlagsStretchRatio = 1,
@@ -385,8 +413,9 @@ namespace Content.Client.Cargo.UI
};
AddChild(MainButton);
- var hBox = new HBoxContainer
+ var hBox = new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
HorizontalExpand = true
};
@@ -432,8 +461,9 @@ namespace Content.Client.Cargo.UI
{
HorizontalExpand = true;
- var hBox = new HBoxContainer
+ var hBox = new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
HorizontalExpand = true,
};
@@ -444,8 +474,9 @@ namespace Content.Client.Cargo.UI
};
hBox.AddChild(Icon);
- var vBox = new VBoxContainer
+ var vBox = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
HorizontalExpand = true,
VerticalExpand = true
};
diff --git a/Content.Client/Cargo/UI/CargoConsoleOrderMenu.cs b/Content.Client/Cargo/UI/CargoConsoleOrderMenu.cs
index d368abe666..f5daf8d4f1 100644
--- a/Content.Client/Cargo/UI/CargoConsoleOrderMenu.cs
+++ b/Content.Client/Cargo/UI/CargoConsoleOrderMenu.cs
@@ -3,6 +3,7 @@ using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Cargo.UI
{
@@ -19,7 +20,10 @@ namespace Content.Client.Cargo.UI
Title = Loc.GetString("cargo-console-order-menu-title");
- var vBox = new VBoxContainer();
+ var vBox = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Vertical
+ };
var gridContainer = new GridContainer { Columns = 2 };
var requesterLabel = new Label { Text = Loc.GetString("cargo-console-order-menu-requester-label") };
diff --git a/Content.Client/Changelog/ChangelogWindow.xaml b/Content.Client/Changelog/ChangelogWindow.xaml
index c763c4ad2e..41ac1c70ee 100644
--- a/Content.Client/Changelog/ChangelogWindow.xaml
+++ b/Content.Client/Changelog/ChangelogWindow.xaml
@@ -3,20 +3,20 @@
xmlns:ui="clr-namespace:Content.Client.HUD.UI"
MinSize="500 400" MouseFilter="Stop">
-
-
+
+
-
+
-
+
-
+
diff --git a/Content.Client/Changelog/ChangelogWindow.xaml.cs b/Content.Client/Changelog/ChangelogWindow.xaml.cs
index f5e4360f1c..c6117128f9 100644
--- a/Content.Client/Changelog/ChangelogWindow.xaml.cs
+++ b/Content.Client/Changelog/ChangelogWindow.xaml.cs
@@ -15,6 +15,7 @@ using Robust.Shared.Localization;
using Robust.Shared.Maths;
using Robust.Shared.Utility;
using static Content.Client.Changelog.ChangelogManager;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Changelog
{
@@ -94,10 +95,14 @@ namespace Content.Client.Changelog
var upArrow =
_resourceCache.GetTexture("/Textures/Interface/Changelog/up_arrow.svg.192dpi.png");
- var readDivider = new VBoxContainer();
-
- var hBox = new HBoxContainer
+ var readDivider = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical
+ };
+
+ var hBox = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Horizontal,
HorizontalAlignment = HAlignment.Center,
Children =
{
@@ -148,8 +153,9 @@ namespace Content.Client.Changelog
{
var text = new RichTextLabel();
text.SetMessage(FormattedMessage.FromMarkup(change.Message));
- ChangelogBody.AddChild(new HBoxContainer
+ ChangelogBody.AddChild(new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Margin = new Thickness(14, 1, 10, 2),
Children =
{
diff --git a/Content.Client/CharacterAppearance/MagicMirrorBoundUserInterface.cs b/Content.Client/CharacterAppearance/MagicMirrorBoundUserInterface.cs
index 34ef6f1900..1749ec46b8 100644
--- a/Content.Client/CharacterAppearance/MagicMirrorBoundUserInterface.cs
+++ b/Content.Client/CharacterAppearance/MagicMirrorBoundUserInterface.cs
@@ -13,6 +13,7 @@ using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Maths;
using static Content.Shared.CharacterAppearance.Components.SharedMagicMirrorComponent;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.CharacterAppearance
{
@@ -107,8 +108,9 @@ namespace Content.Client.CharacterAppearance
MinSize = (50, 0)
};
- AddChild(new HBoxContainer
+ AddChild(new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
_slider,
@@ -204,10 +206,16 @@ namespace Content.Client.CharacterAppearance
{
IoCManager.InjectDependencies(this);
- var vBox = new VBoxContainer();
+ var vBox = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Vertical
+ };
AddChild(vBox);
- _colorContainer = new VBoxContainer();
+ _colorContainer = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Vertical
+ };
vBox.AddChild(_colorContainer);
_colorContainer.AddChild(_colorSliderR = new ColorSlider(StyleNano.StyleClassSliderRed));
_colorContainer.AddChild(_colorSliderG = new ColorSlider(StyleNano.StyleClassSliderGreen));
@@ -289,7 +297,10 @@ namespace Content.Client.CharacterAppearance
public EyeColorPicker()
{
- var vBox = new VBoxContainer();
+ var vBox = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Vertical
+ };
AddChild(vBox);
vBox.AddChild(_colorSliderR = new ColorSlider(StyleNano.StyleClassSliderRed));
@@ -340,8 +351,9 @@ namespace Content.Client.CharacterAppearance
_eyeColorPicker = new EyeColorPicker {SizeFlagsHorizontal = SizeFlags.FillExpand};
_eyeColorPicker.OnEyeColorPicked += newColor => owner.EyeColorSelected(newColor);
- Contents.AddChild(new HBoxContainer
+ Contents.AddChild(new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
SeparationOverride = 8,
Children = {_hairStylePicker, _facialHairStylePicker, _eyeColorPicker}
});
diff --git a/Content.Client/CharacterInfo/Components/CharacterInfoComponent.cs b/Content.Client/CharacterInfo/Components/CharacterInfoComponent.cs
index 7161808649..ce4f536335 100644
--- a/Content.Client/CharacterInfo/Components/CharacterInfoComponent.cs
+++ b/Content.Client/CharacterInfo/Components/CharacterInfoComponent.cs
@@ -62,19 +62,21 @@ namespace Content.Client.CharacterInfo.Components
public Label NameLabel { get; }
public Label SubText { get; }
- public VBoxContainer ObjectivesContainer { get; }
+ public BoxContainer ObjectivesContainer { get; }
public CharacterInfoControl(IResourceCache resourceCache)
{
IoCManager.InjectDependencies(this);
- AddChild(new HBoxContainer
+ AddChild(new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
(SpriteView = new SpriteView { Scale = (2, 2)}),
- new VBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
VerticalAlignment = VAlignment.Top,
Children =
{
@@ -100,7 +102,10 @@ namespace Content.Client.CharacterInfo.Components
Text = Loc.GetString("character-info-objectives-label"),
HorizontalAlignment = HAlignment.Center
});
- ObjectivesContainer = new VBoxContainer();
+ ObjectivesContainer = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Vertical
+ };
AddChild(ObjectivesContainer);
AddChild(new Placeholder()
@@ -116,8 +121,9 @@ namespace Content.Client.CharacterInfo.Components
ObjectivesContainer.RemoveAllChildren();
foreach (var (groupId, objectiveConditions) in characterInfoMessage.Objectives)
{
- var vbox = new VBoxContainer
+ var vbox = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
Modulate = Color.Gray
};
@@ -129,7 +135,10 @@ namespace Content.Client.CharacterInfo.Components
foreach (var objectiveCondition in objectiveConditions)
{
- var hbox = new HBoxContainer();
+ var hbox = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Horizontal
+ };
hbox.AddChild(new ProgressTextureRect
{
Texture = objectiveCondition.SpriteSpecifier.Frame0(),
@@ -140,8 +149,9 @@ namespace Content.Client.CharacterInfo.Components
{
MinSize = (10,0)
});
- hbox.AddChild(new VBoxContainer
+ hbox.AddChild(new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
Children =
{
new Label{Text = objectiveCondition.Title},
diff --git a/Content.Client/CharacterInterface/CharacterInterfaceComponent.cs b/Content.Client/CharacterInterface/CharacterInterfaceComponent.cs
index 95f769e126..f071c03269 100644
--- a/Content.Client/CharacterInterface/CharacterInterfaceComponent.cs
+++ b/Content.Client/CharacterInterface/CharacterInterfaceComponent.cs
@@ -9,6 +9,7 @@ using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.CharacterInterface
{
@@ -110,14 +111,17 @@ namespace Content.Client.CharacterInterface
///
public class CharacterWindow : SS14Window
{
- private readonly VBoxContainer _contentsVBox;
+ private readonly BoxContainer _contentsVBox;
private readonly List _windowComponents;
public CharacterWindow(List windowComponents)
{
Title = "Character";
- _contentsVBox = new VBoxContainer();
+ _contentsVBox = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Vertical
+ };
Contents.AddChild(_contentsVBox);
windowComponents.Sort((a, b) => ((int) a.Priority).CompareTo((int) b.Priority));
diff --git a/Content.Client/Chat/UI/ChatBox.cs b/Content.Client/Chat/UI/ChatBox.cs
index 1052f499c2..f94cdcaded 100644
--- a/Content.Client/Chat/UI/ChatBox.cs
+++ b/Content.Client/Chat/UI/ChatBox.cs
@@ -19,6 +19,7 @@ using Robust.Shared.Localization;
using Robust.Shared.Maths;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Chat.UI
{
@@ -78,11 +79,11 @@ namespace Content.Client.Chat.UI
private readonly Popup _channelSelectorPopup;
private readonly Button _channelSelector;
- private readonly HBoxContainer _channelSelectorHBox;
+ private readonly BoxContainer _channelSelectorHBox;
private readonly FilterButton _filterButton;
private readonly Popup _filterPopup;
private readonly PanelContainer _filterPopupPanel;
- private readonly VBoxContainer _filterVBox;
+ private readonly BoxContainer _filterVBox;
private DragMode _currentDrag = DragMode.None;
private Vector2 _dragOffsetTopLeft;
private Vector2 _dragOffsetBottomRight;
@@ -126,8 +127,9 @@ namespace Content.Client.Chat.UI
HorizontalExpand = true,
Children =
{
- new VBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
Children =
{
(Contents = new OutputPanel
@@ -140,8 +142,9 @@ namespace Content.Client.Chat.UI
HorizontalExpand = true,
Children =
{
- new HBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
HorizontalExpand = true,
SeparationOverride = 4,
Children =
@@ -181,13 +184,15 @@ namespace Content.Client.Chat.UI
StyleClasses = {StyleNano.StyleClassBorderedWindowPanel},
Children =
{
- new HBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
new Control{MinSize = (4,0)},
- (_filterVBox = new VBoxContainer
+ (_filterVBox = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
SeparationOverride = 4
})
}
@@ -201,8 +206,9 @@ namespace Content.Client.Chat.UI
{
Children =
{
- (_channelSelectorHBox = new HBoxContainer
+ (_channelSelectorHBox = new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
SeparationOverride = 1
})
}
diff --git a/Content.Client/Chemistry/UI/ChemMasterWindow.cs b/Content.Client/Chemistry/UI/ChemMasterWindow.cs
index f46fc8fd0e..c627470286 100644
--- a/Content.Client/Chemistry/UI/ChemMasterWindow.cs
+++ b/Content.Client/Chemistry/UI/ChemMasterWindow.cs
@@ -14,6 +14,7 @@ using Robust.Shared.Maths;
using Robust.Shared.Prototypes;
using static Content.Shared.Chemistry.Components.SharedChemMasterComponent;
using static Robust.Client.UserInterface.Controls.BaseButton;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Chemistry.UI
{
@@ -25,11 +26,11 @@ namespace Content.Client.Chemistry.UI
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
/// Contains info about the reagent container such as it's contents, if one is loaded into the dispenser.
- private readonly VBoxContainer ContainerInfo;
+ private readonly BoxContainer ContainerInfo;
- private readonly VBoxContainer BufferInfo;
+ private readonly BoxContainer BufferInfo;
- private readonly VBoxContainer PackagingInfo;
+ private readonly BoxContainer PackagingInfo;
/// Ejects the reagent container from the dispenser.
public Button EjectButton { get; }
@@ -41,8 +42,8 @@ namespace Content.Client.Chemistry.UI
public event Action? OnChemButtonPressed;
- public HBoxContainer PillInfo { get; set; }
- public HBoxContainer BottleInfo { get; set; }
+ public BoxContainer PillInfo { get; set; }
+ public BoxContainer BottleInfo { get; set; }
public SpinBox PillAmount { get; set; }
public SpinBox BottleAmount { get; set; }
public Button CreatePills { get; }
@@ -57,13 +58,15 @@ namespace Content.Client.Chemistry.UI
MinSize = SetSize = (400, 525);
IoCManager.InjectDependencies(this);
- Contents.AddChild(new VBoxContainer
+ Contents.AddChild(new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
Children =
{
//Container
- new HBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
new Label {Text = Loc.GetString("chem-master-window-container-label")},
@@ -84,8 +87,9 @@ namespace Content.Client.Chemistry.UI
Children =
{
//Currently empty, when server sends state data this will have container contents and fill volume.
- (ContainerInfo = new VBoxContainer
+ (ContainerInfo = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
HorizontalExpand = true,
Children =
{
@@ -102,8 +106,9 @@ namespace Content.Client.Chemistry.UI
new Control {MinSize = (0.0f, 10.0f)},
//Buffer
- new HBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
new Label {Text = Loc.GetString("chem-master-window-buffer-text")},
@@ -126,8 +131,9 @@ namespace Content.Client.Chemistry.UI
Children =
{
//Buffer reagent list
- (BufferInfo = new VBoxContainer
+ (BufferInfo = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
HorizontalExpand = true,
Children =
{
@@ -144,8 +150,9 @@ namespace Content.Client.Chemistry.UI
new Control {MinSize = (0.0f, 10.0f)},
//Packaging
- new HBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
new Label {Text = $"{Loc.GetString("chem-master-window-packaging-text")} "},
@@ -165,8 +172,9 @@ namespace Content.Client.Chemistry.UI
Children =
{
//Packaging options
- (PackagingInfo = new VBoxContainer
+ (PackagingInfo = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
HorizontalExpand = true,
}),
@@ -176,8 +184,9 @@ namespace Content.Client.Chemistry.UI
});
//Pills
- PillInfo = new HBoxContainer
+ PillInfo = new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
new Label
@@ -213,8 +222,9 @@ namespace Content.Client.Chemistry.UI
PillInfo.AddChild(CreatePills);
//Bottles
- BottleInfo = new HBoxContainer
+ BottleInfo = new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
new Label
@@ -315,8 +325,9 @@ namespace Content.Client.Chemistry.UI
return;
}
- ContainerInfo.Children.Add(new HBoxContainer // Name of the container and its fill status (Ex: 44/100u)
+ ContainerInfo.Children.Add(new BoxContainer // Name of the container and its fill status (Ex: 44/100u)
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
new Label {Text = $"{state.ContainerName}: "},
@@ -339,8 +350,9 @@ namespace Content.Client.Chemistry.UI
if (proto != null)
{
- ContainerInfo.Children.Add(new HBoxContainer
+ ContainerInfo.Children.Add(new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
new Label {Text = $"{name}: "},
@@ -371,7 +383,10 @@ namespace Content.Client.Chemistry.UI
return;
}
- var bufferHBox = new HBoxContainer();
+ var bufferHBox = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Horizontal
+ };
BufferInfo.AddChild(bufferHBox);
var bufferLabel = new Label { Text = $"{Loc.GetString("chem-master-window-buffer-label")} " };
@@ -394,8 +409,9 @@ namespace Content.Client.Chemistry.UI
if (proto != null)
{
- BufferInfo.Children.Add(new HBoxContainer
+ BufferInfo.Children.Add(new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
//SizeFlagsHorizontal = SizeFlags.ShrinkEnd,
Children =
{
diff --git a/Content.Client/Chemistry/UI/ReagentDispenserWindow.cs b/Content.Client/Chemistry/UI/ReagentDispenserWindow.cs
index acf11ca5fc..e5b3571027 100644
--- a/Content.Client/Chemistry/UI/ReagentDispenserWindow.cs
+++ b/Content.Client/Chemistry/UI/ReagentDispenserWindow.cs
@@ -12,6 +12,7 @@ using Robust.Shared.Localization;
using Robust.Shared.Maths;
using Robust.Shared.Prototypes;
using static Content.Shared.Chemistry.Dispenser.SharedReagentDispenserComponent;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Chemistry.UI
{
@@ -23,7 +24,7 @@ namespace Content.Client.Chemistry.UI
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
/// Contains info about the reagent container such as it's contents, if one is loaded into the dispenser.
- private readonly VBoxContainer ContainerInfo;
+ private readonly BoxContainer ContainerInfo;
/// Sets the dispense amount to 1 when pressed.
public Button DispenseButton1 { get; }
@@ -72,13 +73,15 @@ namespace Content.Client.Chemistry.UI
var dispenseAmountGroup = new ButtonGroup();
- Contents.AddChild(new VBoxContainer
+ Contents.AddChild(new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
Children =
{
//First, our dispense amount buttons
- new HBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
new Label {Text = Loc.GetString("reagent-dispenser-window-amount-to-dispense-label")},
@@ -104,8 +107,9 @@ namespace Content.Client.Chemistry.UI
}),
//Padding
new Control {MinSize = (0.0f, 10.0f)},
- new HBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
new Label {Text = Loc.GetString("reagent-dispenser-window-container-label") + " "},
@@ -126,8 +130,9 @@ namespace Content.Client.Chemistry.UI
Children =
{
//Currently empty, when server sends state data this will have container contents and fill volume.
- (ContainerInfo = new VBoxContainer
+ (ContainerInfo = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
HorizontalExpand = true,
Children =
{
@@ -263,8 +268,9 @@ namespace Content.Client.Chemistry.UI
return;
}
- ContainerInfo.Children.Add(new HBoxContainer // Name of the container and its fill status (Ex: 44/100u)
+ ContainerInfo.Children.Add(new BoxContainer // Name of the container and its fill status (Ex: 44/100u)
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
new Label {Text = $"{state.ContainerName}: "},
@@ -293,8 +299,9 @@ namespace Content.Client.Chemistry.UI
//Check if the reagent is being moused over. If so, color it green.
if (proto != null && proto.ID == highlightedReagentId)
{
- ContainerInfo.Children.Add(new HBoxContainer
+ ContainerInfo.Children.Add(new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
new Label
@@ -312,8 +319,9 @@ namespace Content.Client.Chemistry.UI
}
else //Otherwise, color it the normal colors.
{
- ContainerInfo.Children.Add(new HBoxContainer
+ ContainerInfo.Children.Add(new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
new Label {Text = $"{name}: "},
diff --git a/Content.Client/Cloning/UI/AcceptCloningWindow.cs b/Content.Client/Cloning/UI/AcceptCloningWindow.cs
index c26d95a30f..b37e693679 100644
--- a/Content.Client/Cloning/UI/AcceptCloningWindow.cs
+++ b/Content.Client/Cloning/UI/AcceptCloningWindow.cs
@@ -2,6 +2,7 @@ using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
using Robust.Shared.Localization;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Cloning.UI
{
@@ -15,21 +16,24 @@ namespace Content.Client.Cloning.UI
Title = Loc.GetString("accept-cloning-window-title");
- Contents.AddChild(new VBoxContainer
+ Contents.AddChild(new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
Children =
{
- new VBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
Children =
{
(new Label()
{
Text = Loc.GetString("accept-cloning-window-prompt-text-part")
}),
- new HBoxContainer
+ new BoxContainer
{
- Align = BoxContainer.AlignMode.Center,
+ Orientation = LayoutOrientation.Horizontal,
+ Align = AlignMode.Center,
Children =
{
(AcceptButton = new Button
diff --git a/Content.Client/Cloning/UI/CloningPodWindow.cs b/Content.Client/Cloning/UI/CloningPodWindow.cs
index b085c5294d..a52ef93ebd 100644
--- a/Content.Client/Cloning/UI/CloningPodWindow.cs
+++ b/Content.Client/Cloning/UI/CloningPodWindow.cs
@@ -9,6 +9,7 @@ using Robust.Shared.Localization;
using Robust.Shared.Maths;
using Robust.Shared.Timing;
using static Content.Shared.Cloning.SharedCloningPodComponent;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Cloning.UI
{
@@ -16,7 +17,7 @@ namespace Content.Client.Cloning.UI
{
private Dictionary _scanManager;
- private readonly VBoxContainer _scanList;
+ private readonly BoxContainer _scanList;
public readonly Button CloneButton;
public readonly Button EjectButton;
private CloningScanButton? _selectedButton;
@@ -35,8 +36,9 @@ namespace Content.Client.Cloning.UI
Title = Loc.GetString("cloning-pod-window-title");
- Contents.AddChild(new VBoxContainer
+ Contents.AddChild(new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
Children =
{
new ScrollContainer
@@ -45,11 +47,15 @@ namespace Content.Client.Cloning.UI
VerticalExpand = true,
Children =
{
- (_scanList = new VBoxContainer())
+ (_scanList = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Vertical
+ })
}
},
- new VBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
Children =
{
(CloneButton = new Button
@@ -74,8 +80,9 @@ namespace Content.Client.Cloning.UI
{
Text = Loc.GetString("cloning-pod-eject-body-button")
}),
- new HBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
new Label()
@@ -219,8 +226,9 @@ namespace Content.Client.Cloning.UI
ToggleMode = true,
});
- AddChild(new HBoxContainer
+ AddChild(new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
(EntityTextureRect = new TextureRect
diff --git a/Content.Client/Communications/UI/CommunicationsConsoleMenu.cs b/Content.Client/Communications/UI/CommunicationsConsoleMenu.cs
index 56d8497104..af12b76965 100644
--- a/Content.Client/Communications/UI/CommunicationsConsoleMenu.cs
+++ b/Content.Client/Communications/UI/CommunicationsConsoleMenu.cs
@@ -5,6 +5,7 @@ using Robust.Client.UserInterface.CustomControls;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Maths;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
using Timer = Robust.Shared.Timing.Timer;
namespace Content.Client.Communications.UI
@@ -42,7 +43,12 @@ namespace Content.Client.Communications.UI
EmergencyShuttleButton.OnPressed += (_) => Owner.EmergencyShuttleButtonPressed();
EmergencyShuttleButton.Disabled = !owner.CanCall;
- var vbox = new VBoxContainer() {HorizontalExpand = true, VerticalExpand = true};
+ var vbox = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Vertical,
+ HorizontalExpand = true,
+ VerticalExpand = true
+ };
vbox.AddChild(_messageInput);
vbox.AddChild(new Control(){MinSize = new Vector2(0,10), HorizontalExpand = true});
vbox.AddChild(AnnounceButton);
@@ -50,7 +56,12 @@ namespace Content.Client.Communications.UI
vbox.AddChild(_countdownLabel);
vbox.AddChild(EmergencyShuttleButton);
- var hbox = new HBoxContainer() {HorizontalExpand = true, VerticalExpand = true};
+ var hbox = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Horizontal,
+ HorizontalExpand = true,
+ VerticalExpand = true
+ };
hbox.AddChild(new Control(){MinSize = new Vector2(100,0), HorizontalExpand = true});
hbox.AddChild(vbox);
hbox.AddChild(new Control(){MinSize = new Vector2(100,0), HorizontalExpand = true});
diff --git a/Content.Client/Configurable/UI/ConfigurationMenu.cs b/Content.Client/Configurable/UI/ConfigurationMenu.cs
index ea0c717b3d..07ad8ecf99 100644
--- a/Content.Client/Configurable/UI/ConfigurationMenu.cs
+++ b/Content.Client/Configurable/UI/ConfigurationMenu.cs
@@ -6,6 +6,7 @@ using Robust.Shared.Localization;
using Robust.Shared.Maths;
using static Content.Shared.Configurable.SharedConfigurationComponent;
using static Robust.Client.UserInterface.Controls.BaseButton;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Configurable.UI
{
@@ -13,9 +14,8 @@ namespace Content.Client.Configurable.UI
{
public ConfigurationBoundUserInterface Owner { get; }
- private readonly VBoxContainer _baseContainer;
- private readonly VBoxContainer _column;
- private readonly HBoxContainer _row;
+ private readonly BoxContainer _column;
+ private readonly BoxContainer _row;
private readonly List<(string name, LineEdit input)> _inputs;
@@ -28,20 +28,23 @@ namespace Content.Client.Configurable.UI
Title = Loc.GetString("configuration-menu-device-title");
- _baseContainer = new VBoxContainer
+ BoxContainer baseContainer = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
VerticalExpand = true,
HorizontalExpand = true
};
- _column = new VBoxContainer
+ _column = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
Margin = new Thickness(8),
SeparationOverride = 16,
};
- _row = new HBoxContainer
+ _row = new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
SeparationOverride = 16,
HorizontalExpand = true
};
@@ -63,9 +66,9 @@ namespace Content.Client.Configurable.UI
};
outerColumn.AddChild(_column);
- _baseContainer.AddChild(outerColumn);
- _baseContainer.AddChild(confirmButton);
- Contents.AddChild(_baseContainer);
+ baseContainer.AddChild(outerColumn);
+ baseContainer.AddChild(confirmButton);
+ Contents.AddChild(baseContainer);
}
public void Populate(ConfigurationBoundUserInterfaceState state)
@@ -97,7 +100,10 @@ namespace Content.Client.Configurable.UI
_inputs.Add((field.Key, input));
- var row = new HBoxContainer();
+ var row = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Horizontal
+ };
CopyProperties(_row, row);
row.AddChild(label);
diff --git a/Content.Client/Construction/UI/ConstructionMenu.xaml b/Content.Client/Construction/UI/ConstructionMenu.xaml
index b95c4d4f58..2c943206bb 100644
--- a/Content.Client/Construction/UI/ConstructionMenu.xaml
+++ b/Content.Client/Construction/UI/ConstructionMenu.xaml
@@ -1,32 +1,32 @@
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
-
-
-
+
+
+
+
diff --git a/Content.Client/ContextMenu/UI/ContextMenuElement.cs b/Content.Client/ContextMenu/UI/ContextMenuElement.cs
index 0d1c624b2a..9f9c049763 100644
--- a/Content.Client/ContextMenu/UI/ContextMenuElement.cs
+++ b/Content.Client/ContextMenu/UI/ContextMenuElement.cs
@@ -13,6 +13,7 @@ using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Maths;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
using Vector2 = Robust.Shared.Maths.Vector2;
namespace Content.Client.ContextMenu.UI
@@ -63,8 +64,9 @@ namespace Content.Client.ContextMenu.UI
OutlineComponent = ContextEntity.GetComponentOrNull();
AddChild(
- new HBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
new LayoutContainer
@@ -129,14 +131,16 @@ namespace Content.Client.ContextMenu.UI
LayoutContainer.SetGrowVertical(_label, LayoutContainer.GrowDirection.Begin);
AddChild(
- new HBoxContainer()
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
SeparationOverride = 6,
Children =
{
new LayoutContainer { Children = { _spriteView, _label } },
- new HBoxContainer()
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
SeparationOverride = 6,
Children =
{
@@ -179,7 +183,7 @@ namespace Content.Client.ContextMenu.UI
private const int MaxItemsBeforeScroll = 10;
private const int MarginSizeBetweenElements = 2;
- public VBoxContainer List { get; }
+ public BoxContainer List { get; }
public int Depth { get; }
public ContextMenuPopup(int depth = 0)
@@ -190,7 +194,10 @@ namespace Content.Client.ContextMenu.UI
HScrollEnabled = false,
Children = { new PanelContainer
{
- Children = { (List = new VBoxContainer()) },
+ Children = { (List = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Vertical
+ }) },
PanelOverride = new StyleBoxFlat { BackgroundColor = MarginColor }
}}
});
diff --git a/Content.Client/Crayon/UI/CrayonWindow.cs b/Content.Client/Crayon/UI/CrayonWindow.cs
index a1b1fc33d1..6c6de15a10 100644
--- a/Content.Client/Crayon/UI/CrayonWindow.cs
+++ b/Content.Client/Crayon/UI/CrayonWindow.cs
@@ -9,6 +9,7 @@ using Robust.Shared.Localization;
using Robust.Shared.Maths;
using Robust.Shared.Utility;
using static Robust.Client.UserInterface.Controls.BaseButton;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Crayon.UI
{
@@ -27,7 +28,10 @@ namespace Content.Client.Crayon.UI
Title = Loc.GetString("crayon-window-title");
Owner = owner;
- var vbox = new VBoxContainer();
+ var vbox = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Vertical
+ };
Contents.AddChild(vbox);
_search = new LineEdit();
diff --git a/Content.Client/Credits/CreditsWindow.cs b/Content.Client/Credits/CreditsWindow.cs
index a755979ee5..b617f25fb1 100644
--- a/Content.Client/Credits/CreditsWindow.cs
+++ b/Content.Client/Credits/CreditsWindow.cs
@@ -16,6 +16,7 @@ using Robust.Shared.Localization;
using Robust.Shared.Maths;
using Robust.Shared.Utility;
using YamlDotNet.RepresentationModel;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Credits
{
@@ -71,8 +72,9 @@ namespace Content.Client.Credits
private void PopulateLicenses(ScrollContainer licensesList)
{
- var vBox = new VBoxContainer
+ var vBox = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
Margin = new Thickness(2, 2, 0, 0)
};
@@ -93,8 +95,9 @@ namespace Content.Client.Credits
private void PopulatePatronsList(Control patronsList)
{
- var vBox = new VBoxContainer
+ var vBox = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
Margin = new Thickness(2, 2, 0, 0)
};
var patrons = LoadPatrons();
@@ -152,13 +155,15 @@ namespace Content.Client.Credits
{
Button contributeButton;
- var vBox = new VBoxContainer
+ var vBox = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
Margin = new Thickness(2, 2, 0, 0)
};
- vBox.AddChild(new HBoxContainer
+ vBox.AddChild(new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
HorizontalAlignment = HAlignment.Center,
SeparationOverride = 20,
Children =
diff --git a/Content.Client/Disposal/UI/DisposalMailingUnitWindow.cs b/Content.Client/Disposal/UI/DisposalMailingUnitWindow.cs
index 13e49516ad..db6b24044d 100644
--- a/Content.Client/Disposal/UI/DisposalMailingUnitWindow.cs
+++ b/Content.Client/Disposal/UI/DisposalMailingUnitWindow.cs
@@ -7,6 +7,7 @@ using Robust.Client.UserInterface.CustomControls;
using Robust.Shared.Localization;
using Robust.Shared.Maths;
using static Content.Shared.Disposal.Components.SharedDisposalMailingUnitComponent;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Disposal.UI
{
@@ -30,18 +31,21 @@ namespace Content.Client.Disposal.UI
{
MinSize = SetSize = (460, 230);
TargetList = new List();
- Contents.AddChild(new HBoxContainer
+ Contents.AddChild(new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
- new VBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
HorizontalExpand = true,
Margin = new Thickness(8, 0),
Children =
{
- new HBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
new Label {Text = $"{Loc.GetString("disposal-mailing-unit-window-state-label")} "},
@@ -50,8 +54,9 @@ namespace Content.Client.Disposal.UI
}
},
new Control {MinSize = (0, 10)},
- new HBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
HorizontalExpand = true,
Children =
{
@@ -73,8 +78,9 @@ namespace Content.Client.Disposal.UI
}
},
new Control {MinSize = (0, 10)},
- new HBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
HorizontalExpand = true,
Children =
{
@@ -94,8 +100,9 @@ namespace Content.Client.Disposal.UI
}
},
new Control {MinSize = (0, 10)},
- new HBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
HorizontalExpand = true,
Children =
{
@@ -114,8 +121,9 @@ namespace Content.Client.Disposal.UI
}
},
new Control {MinSize = (0, 10)},
- new HBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
(Power = new CheckButton {Text = Loc.GetString("disposal-mailing-unit-power-button")}),
@@ -123,13 +131,15 @@ namespace Content.Client.Disposal.UI
}
}
},
- new VBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
Margin = new Thickness(12, 0, 8, 0),
Children =
{
- new HBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
new Label
@@ -139,8 +149,9 @@ namespace Content.Client.Disposal.UI
}
},
new Control {MinSize = new Vector2(0, 8)},
- new HBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
VerticalExpand = true,
Children =
{
@@ -161,16 +172,19 @@ namespace Content.Client.Disposal.UI
HorizontalExpand = true,
MinSize = new Vector2(0, 1),
},
- new HBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
- new VBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
Children =
{
- new HBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Margin = new Thickness(4, 0, 0, 0),
Children =
{
diff --git a/Content.Client/Disposal/UI/DisposalRouterWindow.cs b/Content.Client/Disposal/UI/DisposalRouterWindow.cs
index aed47c39bf..b81e9cb5ae 100644
--- a/Content.Client/Disposal/UI/DisposalRouterWindow.cs
+++ b/Content.Client/Disposal/UI/DisposalRouterWindow.cs
@@ -4,6 +4,7 @@ using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
using Robust.Shared.Localization;
using static Content.Shared.Disposal.Components.SharedDisposalRouterComponent;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Disposal.UI
{
@@ -20,14 +21,16 @@ namespace Content.Client.Disposal.UI
MinSize = SetSize = (500, 110);
Title = Loc.GetString("disposal-router-window-title");
- Contents.AddChild(new VBoxContainer
+ Contents.AddChild(new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
Children =
{
new Label {Text = Loc.GetString("disposal-router-window-tags-label")},
new Control {MinSize = (0, 10)},
- new HBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
(TagInput = new LineEdit
diff --git a/Content.Client/Disposal/UI/DisposalTaggerWindow.cs b/Content.Client/Disposal/UI/DisposalTaggerWindow.cs
index d548a7da30..3ff60c676b 100644
--- a/Content.Client/Disposal/UI/DisposalTaggerWindow.cs
+++ b/Content.Client/Disposal/UI/DisposalTaggerWindow.cs
@@ -4,6 +4,7 @@ using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
using Robust.Shared.Localization;
using static Content.Shared.Disposal.Components.SharedDisposalTaggerComponent;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Disposal.UI
{
@@ -20,14 +21,16 @@ namespace Content.Client.Disposal.UI
MinSize = SetSize = (500, 110);
Title = Loc.GetString("disposal-tagger-window-title");
- Contents.AddChild(new VBoxContainer
+ Contents.AddChild(new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
Children =
{
new Label {Text = Loc.GetString("disposal-tagger-window-tag-input-label")},
new Control {MinSize = (0, 10)},
- new HBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
(TagInput = new LineEdit
diff --git a/Content.Client/Disposal/UI/DisposalUnitWindow.cs b/Content.Client/Disposal/UI/DisposalUnitWindow.cs
index a1bdd0d211..627cad95b4 100644
--- a/Content.Client/Disposal/UI/DisposalUnitWindow.cs
+++ b/Content.Client/Disposal/UI/DisposalUnitWindow.cs
@@ -8,6 +8,7 @@ using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Maths;
using static Content.Shared.Disposal.Components.SharedDisposalUnitComponent;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Disposal.UI
{
@@ -27,12 +28,14 @@ namespace Content.Client.Disposal.UI
IoCManager.InjectDependencies(this);
MinSize = SetSize = (300, 140);
Resizable = false;
- Contents.AddChild(new VBoxContainer
+ Contents.AddChild(new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
Children =
{
- new HBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
SeparationOverride = 4,
Children =
{
@@ -41,8 +44,9 @@ namespace Content.Client.Disposal.UI
}
},
new Control {MinSize = (0, 5)},
- new HBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
SeparationOverride = 4,
Children =
{
@@ -59,8 +63,9 @@ namespace Content.Client.Disposal.UI
}
},
new Control {MinSize = (0, 10)},
- new HBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
(Engage = new Button
diff --git a/Content.Client/EscapeMenu/UI/EscapeMenu.xaml b/Content.Client/EscapeMenu/UI/EscapeMenu.xaml
index aa892e473b..baed55524a 100644
--- a/Content.Client/EscapeMenu/UI/EscapeMenu.xaml
+++ b/Content.Client/EscapeMenu/UI/EscapeMenu.xaml
@@ -4,11 +4,11 @@
Title="{Loc 'ui-escape-title'}"
Resizable="False">
-
+
-
+
diff --git a/Content.Client/EscapeMenu/UI/OptionsMenu.Audio.cs b/Content.Client/EscapeMenu/UI/OptionsMenu.Audio.cs
index 40815acde2..64a9feaf76 100644
--- a/Content.Client/EscapeMenu/UI/OptionsMenu.Audio.cs
+++ b/Content.Client/EscapeMenu/UI/OptionsMenu.Audio.cs
@@ -9,6 +9,7 @@ using Robust.Shared;
using Robust.Shared.Configuration;
using Robust.Shared.Localization;
using Robust.Shared.Maths;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.EscapeMenu.UI
{
@@ -31,10 +32,14 @@ namespace Content.Client.EscapeMenu.UI
_cfg = cfg;
_clydeAudio = clydeAudio;
- var vBox = new VBoxContainer();
-
- var contents = new VBoxContainer
+ var vBox = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical
+ };
+
+ var contents = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Vertical,
Margin = new Thickness(2, 2, 2, 0),
VerticalExpand = true,
};
@@ -54,8 +59,9 @@ namespace Content.Client.EscapeMenu.UI
Align = Label.AlignMode.Right
};
- contents.AddChild(new HBoxContainer
+ contents.AddChild(new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
new Control {MinSize = (4, 0)},
@@ -106,9 +112,10 @@ namespace Content.Client.EscapeMenu.UI
HasMargins = false,
Children =
{
- new HBoxContainer
+ new BoxContainer
{
- Align = BoxContainer.AlignMode.End,
+ Orientation = LayoutOrientation.Horizontal,
+ Align = AlignMode.End,
HorizontalExpand = true,
VerticalExpand = true,
Children =
diff --git a/Content.Client/EscapeMenu/UI/OptionsMenu.Graphics.cs b/Content.Client/EscapeMenu/UI/OptionsMenu.Graphics.cs
index 88e67f702c..4c33e17246 100644
--- a/Content.Client/EscapeMenu/UI/OptionsMenu.Graphics.cs
+++ b/Content.Client/EscapeMenu/UI/OptionsMenu.Graphics.cs
@@ -10,6 +10,7 @@ using Robust.Shared.Configuration;
using Robust.Shared.Localization;
using Robust.Shared.Maths;
using Robust.Shared.Prototypes;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.EscapeMenu.UI
{
@@ -47,10 +48,14 @@ namespace Content.Client.EscapeMenu.UI
{
_cfg = cfg;
_prototypeManager = proMan;
- var vBox = new VBoxContainer();
-
- var contents = new VBoxContainer
+ var vBox = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical
+ };
+
+ var contents = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Vertical,
Margin = new Thickness(2, 2, 2, 0),
VerticalExpand = true,
};
@@ -70,8 +75,9 @@ namespace Content.Client.EscapeMenu.UI
LightingPresetOption.AddItem(Loc.GetString("ui-options-lighting-high"));
LightingPresetOption.OnItemSelected += OnLightingQualityChanged;
- contents.AddChild(new HBoxContainer
+ contents.AddChild(new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
new Label {Text = Loc.GetString("ui-options-lighting-label")},
@@ -97,8 +103,9 @@ namespace Content.Client.EscapeMenu.UI
_uiScaleOption.AddItem(Loc.GetString("ui-options-scale-200"));
_uiScaleOption.OnItemSelected += OnUIScaleChanged;
- contents.AddChild(new HBoxContainer
+ contents.AddChild(new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
new Label {Text = Loc.GetString("ui-options-scale-label")},
@@ -114,8 +121,9 @@ namespace Content.Client.EscapeMenu.UI
}
_hudThemeOption.OnItemSelected += OnHudThemeChanged;
- contents.AddChild(new HBoxContainer
+ contents.AddChild(new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
new Label {Text = Loc.GetString("ui-options-hud-theme")},
@@ -152,13 +160,15 @@ namespace Content.Client.EscapeMenu.UI
_viewportLowResCheckBox = new CheckBox { Text = Loc.GetString("ui-options-vp-low-res")};
_viewportLowResCheckBox.OnToggled += OnCheckBoxToggled;
- contents.AddChild(new HBoxContainer
+ contents.AddChild(new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
_viewportStretchCheckBox,
- (_viewportScaleBox = new HBoxContainer
+ (_viewportScaleBox = new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
(_viewportScaleText = new Label
diff --git a/Content.Client/EscapeMenu/UI/OptionsMenu.KeyRebind.cs b/Content.Client/EscapeMenu/UI/OptionsMenu.KeyRebind.cs
index ffde940423..ec11304ffe 100644
--- a/Content.Client/EscapeMenu/UI/OptionsMenu.KeyRebind.cs
+++ b/Content.Client/EscapeMenu/UI/OptionsMenu.KeyRebind.cs
@@ -12,6 +12,7 @@ using Robust.Shared.Localization;
using Robust.Shared.Maths;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.EscapeMenu.UI
{
@@ -40,9 +41,14 @@ namespace Content.Client.EscapeMenu.UI
IoCManager.InjectDependencies(this);
Button resetAllButton;
- var vBox = new VBoxContainer {Margin = new Thickness(2, 0, 0, 0)};
- AddChild(new VBoxContainer
+ var vBox = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
+ Margin = new Thickness(2, 0, 0, 0)
+ };
+ AddChild(new BoxContainer
+ {
+ Orientation = LayoutOrientation.Vertical,
Children =
{
new ScrollContainer
@@ -57,8 +63,9 @@ namespace Content.Client.EscapeMenu.UI
HasMargins = false,
Children =
{
- new HBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
new Control {MinSize = (2, 0)},
@@ -413,8 +420,9 @@ namespace Content.Client.EscapeMenu.UI
BindButton2 = new BindButton(parent, this, StyleBase.ButtonOpenLeft);
ResetButton = new Button {Text = Loc.GetString("ui-options-bind-reset"), StyleClasses = {StyleBase.ButtonCaution}};
- var hBox = new HBoxContainer
+ var hBox = new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
new Control {MinSize = (5, 0)},
diff --git a/Content.Client/Examine/ExamineSystem.cs b/Content.Client/Examine/ExamineSystem.cs
index 5302afc651..f3003cdd44 100644
--- a/Content.Client/Examine/ExamineSystem.cs
+++ b/Content.Client/Examine/ExamineSystem.cs
@@ -15,6 +15,7 @@ using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.Shared.Players;
using Robust.Shared.Utility;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Examine
{
@@ -77,9 +78,16 @@ namespace Content.Client.Examine
panel.ModulateSelfOverride = Color.LightGray.WithAlpha(0.90f);
_examineTooltipOpen.AddChild(panel);
//panel.SetAnchorAndMarginPreset(Control.LayoutPreset.Wide);
- var vBox = new VBoxContainer();
+ var vBox = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Vertical
+ };
panel.AddChild(vBox);
- var hBox = new HBoxContainer {SeparationOverride = 5};
+ var hBox = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Horizontal,
+ SeparationOverride = 5
+ };
vBox.AddChild(hBox);
if (entity.TryGetComponent(out ISpriteComponent? sprite))
{
diff --git a/Content.Client/Ghost/GhostGui.cs b/Content.Client/Ghost/GhostGui.cs
index de7c7cfd27..6616e27e7f 100644
--- a/Content.Client/Ghost/GhostGui.cs
+++ b/Content.Client/Ghost/GhostGui.cs
@@ -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()
.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 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,
diff --git a/Content.Client/Ghost/Roles/UI/GhostRolesEntry.xaml b/Content.Client/Ghost/Roles/UI/GhostRolesEntry.xaml
index 60ac1dc697..04e50e46df 100644
--- a/Content.Client/Ghost/Roles/UI/GhostRolesEntry.xaml
+++ b/Content.Client/Ghost/Roles/UI/GhostRolesEntry.xaml
@@ -1,9 +1,9 @@
-
-
+
-
-
+
+
diff --git a/Content.Client/Ghost/Roles/UI/GhostRolesWindow.xaml b/Content.Client/Ghost/Roles/UI/GhostRolesWindow.xaml
index 8f6de8f9c3..9af69fba4e 100644
--- a/Content.Client/Ghost/Roles/UI/GhostRolesWindow.xaml
+++ b/Content.Client/Ghost/Roles/UI/GhostRolesWindow.xaml
@@ -4,7 +4,7 @@
-
+
diff --git a/Content.Client/Ghost/Roles/UI/MakeGhostRoleWindow.xaml b/Content.Client/Ghost/Roles/UI/MakeGhostRoleWindow.xaml
index 0a5dfa1850..0a51ef7bfb 100644
--- a/Content.Client/Ghost/Roles/UI/MakeGhostRoleWindow.xaml
+++ b/Content.Client/Ghost/Roles/UI/MakeGhostRoleWindow.xaml
@@ -1,26 +1,26 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/Content.Client/Gravity/GravityGeneratorBoundUserInterface.cs b/Content.Client/Gravity/GravityGeneratorBoundUserInterface.cs
index 6dbbe28fb3..5d956ad632 100644
--- a/Content.Client/Gravity/GravityGeneratorBoundUserInterface.cs
+++ b/Content.Client/Gravity/GravityGeneratorBoundUserInterface.cs
@@ -7,6 +7,7 @@ using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Maths;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Gravity
{
@@ -73,8 +74,9 @@ namespace Content.Client.Gravity
Title = Loc.GetString("gravity-generator-window-title");
- var vBox = new VBoxContainer
+ var vBox = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
MinSize = new Vector2(250, 100)
};
Status = new Label
diff --git a/Content.Client/HUD/GameHud.cs b/Content.Client/HUD/GameHud.cs
index bda10542f3..1e780b4600 100644
--- a/Content.Client/HUD/GameHud.cs
+++ b/Content.Client/HUD/GameHud.cs
@@ -25,6 +25,7 @@ using Robust.Shared.Maths;
using Robust.Shared.Prototypes;
using Robust.Shared.Utility;
using static Robust.Client.Input.Keyboard.Key;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
using Control = Robust.Client.UserInterface.Control;
using LC = Robust.Client.UserInterface.Controls.LayoutContainer;
@@ -94,7 +95,7 @@ namespace Content.Client.HUD
internal sealed class GameHud : IGameHud
{
- private HBoxContainer _topButtonsContainer = default!;
+ private BoxContainer _topButtonsContainer = default!;
private TopButton _buttonEscapeMenu = default!;
private TopButton _buttonInfo = default!;
private TopButton _buttonCharacterMenu = default!;
@@ -105,8 +106,8 @@ namespace Content.Client.HUD
private TopButton _buttonSandboxMenu = default!;
private InfoWindow _infoWindow = default!;
private TargetingDoll _targetingDoll = default!;
- private VBoxContainer _combatPanelContainer = default!;
- private VBoxContainer _topNotificationContainer = default!;
+ private BoxContainer _combatPanelContainer = default!;
+ private BoxContainer _topNotificationContainer = default!;
[Dependency] private readonly IResourceCache _resourceCache = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
@@ -183,8 +184,9 @@ namespace Content.Client.HUD
var infoTexture = _resourceCache.GetTexture("/Textures/Interface/info.svg.192dpi.png");
var sandboxTexture = _resourceCache.GetTexture("/Textures/Interface/sandbox.svg.192dpi.png");
- _topButtonsContainer = new HBoxContainer
+ _topButtonsContainer = new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
SeparationOverride = 8
};
@@ -307,8 +309,9 @@ namespace Content.Client.HUD
InputCmdHandler.FromDelegate(s => ButtonInfoOnOnToggled()));
- _combatPanelContainer = new VBoxContainer
+ _combatPanelContainer = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
HorizontalAlignment = Control.HAlignment.Left,
VerticalAlignment = Control.VAlignment.Bottom,
Children =
@@ -324,8 +327,9 @@ namespace Content.Client.HUD
_targetingDoll.OnZoneChanged += args => OnTargetingZoneChanged?.Invoke(args);
- var centerBottomContainer = new VBoxContainer
+ var centerBottomContainer = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
SeparationOverride = 5,
HorizontalAlignment = Control.HAlignment.Center
};
@@ -340,24 +344,28 @@ namespace Content.Client.HUD
VerticalAlignment = Control.VAlignment.Bottom,
HorizontalAlignment = Control.HAlignment.Center
};
- BottomRightInventoryQuickButtonContainer = new HBoxContainer()
+ BottomRightInventoryQuickButtonContainer = new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
VerticalAlignment = Control.VAlignment.Bottom,
HorizontalAlignment = Control.HAlignment.Right
};
- BottomLeftInventoryQuickButtonContainer = new HBoxContainer()
+ BottomLeftInventoryQuickButtonContainer = new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
VerticalAlignment = Control.VAlignment.Bottom,
HorizontalAlignment = Control.HAlignment.Left
};
- TopInventoryQuickButtonContainer = new HBoxContainer()
+ TopInventoryQuickButtonContainer = new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Visible = false,
VerticalAlignment = Control.VAlignment.Bottom,
HorizontalAlignment = Control.HAlignment.Center
};
- var bottomRow = new HBoxContainer()
+ var bottomRow = new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
HorizontalAlignment = Control.HAlignment.Center
};
@@ -376,8 +384,9 @@ namespace Content.Client.HUD
HorizontalAlignment = Control.HAlignment.Center
};
- var rightBottomContainer = new HBoxContainer
+ var rightBottomContainer = new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
SeparationOverride = 5
};
LC.SetAnchorAndMarginPreset(rightBottomContainer, LC.LayoutPreset.BottomRight);
@@ -396,8 +405,9 @@ namespace Content.Client.HUD
LC.SetGrowHorizontal(SuspicionContainer, LC.GrowDirection.End);
LC.SetGrowVertical(SuspicionContainer, LC.GrowDirection.Begin);
- _topNotificationContainer = new VBoxContainer
+ _topNotificationContainer = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
MinSize = (600, 0)
};
RootControl.AddChild(_topNotificationContainer);
@@ -405,7 +415,10 @@ namespace Content.Client.HUD
LC.SetGrowHorizontal(_topNotificationContainer, LC.GrowDirection.Both);
LC.SetGrowVertical(_topNotificationContainer, LC.GrowDirection.End);
- VoteContainer = new VBoxContainer();
+ VoteContainer = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Vertical
+ };
RootControl.AddChild(VoteContainer);
LC.SetAnchorPreset(VoteContainer, LC.LayoutPreset.TopLeft);
LC.SetMarginLeft(VoteContainer, 180);
@@ -564,8 +577,9 @@ namespace Content.Client.HUD
TooltipDelay = CustomTooltipDelay;
AddChild(
- new VBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
Children =
{
(_textureRect = new TextureRect
diff --git a/Content.Client/Hands/HandsGui.cs b/Content.Client/Hands/HandsGui.cs
index 22a7e643e3..ff0fa47b23 100644
--- a/Content.Client/Hands/HandsGui.cs
+++ b/Content.Client/Hands/HandsGui.cs
@@ -21,6 +21,7 @@ using Robust.Shared.Input;
using Robust.Shared.IoC;
using Robust.Shared.Timing;
using Robust.Shared.ViewVariables;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Hands
{
@@ -36,7 +37,7 @@ namespace Content.Client.Hands
private ItemStatusPanel StatusPanel { get; }
- private HBoxContainer HandsContainer { get; }
+ private BoxContainer HandsContainer { get; }
[ViewVariables]
public IReadOnlyList Hands => _hands;
@@ -53,18 +54,24 @@ namespace Content.Client.Hands
IoCManager.InjectDependencies(this);
_configManager.OnValueChanged(CCVars.HudTheme, UpdateHudTheme);
- AddChild(new HBoxContainer
+ AddChild(new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
SeparationOverride = 0,
HorizontalAlignment = HAlignment.Center,
Children =
{
- new VBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
Children =
{
(StatusPanel = ItemStatusPanel.FromSide(HandLocation.Middle)),
- (HandsContainer = new HBoxContainer() { HorizontalAlignment = HAlignment.Center } ),
+ (HandsContainer = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Horizontal,
+ HorizontalAlignment = HAlignment.Center
+ }),
}
},
}
diff --git a/Content.Client/Info/InfoWindow.cs b/Content.Client/Info/InfoWindow.cs
index be54a29f2b..517e39e636 100644
--- a/Content.Client/Info/InfoWindow.cs
+++ b/Content.Client/Info/InfoWindow.cs
@@ -11,6 +11,7 @@ using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Maths;
using Robust.Shared.Utility;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Info
{
@@ -56,8 +57,9 @@ namespace Content.Client.Info
private void PopulateRules(Control rulesList)
{
- var vBox = new VBoxContainer
+ var vBox = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
Margin = new Thickness(2, 2, 0, 0)
};
@@ -97,8 +99,9 @@ namespace Content.Client.Info
{
Button controlsButton;
- var vBox = new VBoxContainer
+ var vBox = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
Margin = new Thickness(2, 2, 0, 0)
};
@@ -130,8 +133,9 @@ namespace Content.Client.Info
AddSection(Loc.GetString("ui-info-header-intro"), "Intro.txt");
- vBox.AddChild(new HBoxContainer
+ vBox.AddChild(new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
MinSize = (0, 10),
Children =
{
@@ -139,8 +143,9 @@ namespace Content.Client.Info
}
});
- vBox.AddChild(new HBoxContainer
+ vBox.AddChild(new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
SeparationOverride = 5,
Children =
{
diff --git a/Content.Client/Info/ServerInfo.cs b/Content.Client/Info/ServerInfo.cs
index 66f290a5a0..6cce59c2e8 100644
--- a/Content.Client/Info/ServerInfo.cs
+++ b/Content.Client/Info/ServerInfo.cs
@@ -21,7 +21,10 @@ namespace Content.Client.Info
};
AddChild(_richTextLabel);
- var buttons = new HBoxContainer();
+ var buttons = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Horizontal
+ };
AddChild(buttons);
var uriOpener = IoCManager.Resolve();
diff --git a/Content.Client/Instruments/UI/InstrumentMenu.xaml b/Content.Client/Instruments/UI/InstrumentMenu.xaml
index 6cd7f78b55..9eafb0a24b 100644
--- a/Content.Client/Instruments/UI/InstrumentMenu.xaml
+++ b/Content.Client/Instruments/UI/InstrumentMenu.xaml
@@ -1,26 +1,26 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/Content.Client/Inventory/HumanInventoryInterfaceController.cs b/Content.Client/Inventory/HumanInventoryInterfaceController.cs
index 0c5ed21557..fa52c89b71 100644
--- a/Content.Client/Inventory/HumanInventoryInterfaceController.cs
+++ b/Content.Client/Inventory/HumanInventoryInterfaceController.cs
@@ -17,6 +17,7 @@ using Robust.Shared.Localization;
using Robust.Shared.Maths;
using Robust.Shared.Prototypes;
using static Content.Shared.Inventory.EquipmentSlotDefines;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Inventory
{
@@ -102,8 +103,9 @@ namespace Content.Client.Inventory
AddButton(out _hudButtonEars, Slots.EARS, "ears");
AddButton(out _hudButtonHead, Slots.HEAD, "head");
- _topQuickButtonsContainer = new HBoxContainer
+ _topQuickButtonsContainer = new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
_hudButtonShoes,
@@ -119,8 +121,9 @@ namespace Content.Client.Inventory
SeparationOverride = 5
};
- _bottomRightQuickButtonsContainer = new HBoxContainer
+ _bottomRightQuickButtonsContainer = new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
_hudButtonPocket1,
@@ -129,8 +132,9 @@ namespace Content.Client.Inventory
},
SeparationOverride = 5
};
- _bottomLeftQuickButtonsContainer = new HBoxContainer
+ _bottomLeftQuickButtonsContainer = new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
_hudButtonBelt,
diff --git a/Content.Client/Items/UI/ItemStatusPanel.cs b/Content.Client/Items/UI/ItemStatusPanel.cs
index 6162c59e51..d880d7ea49 100644
--- a/Content.Client/Items/UI/ItemStatusPanel.cs
+++ b/Content.Client/Items/UI/ItemStatusPanel.cs
@@ -12,6 +12,7 @@ using Robust.Shared.Maths;
using Robust.Shared.Utility;
using Robust.Shared.ViewVariables;
using static Content.Client.IoC.StaticIoC;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Items.UI
{
@@ -23,7 +24,7 @@ namespace Content.Client.Items.UI
[ViewVariables]
private readonly Label _itemNameLabel;
[ViewVariables]
- private readonly VBoxContainer _statusContents;
+ private readonly BoxContainer _statusContents;
[ViewVariables]
private readonly PanelContainer _panel;
@@ -47,12 +48,16 @@ namespace Content.Client.Items.UI
ModulateSelfOverride = Color.White.WithAlpha(0.9f),
Children =
{
- new VBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
SeparationOverride = 0,
Children =
{
- (_statusContents = new VBoxContainer()),
+ (_statusContents = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Vertical
+ }),
(_itemNameLabel = new Label
{
ClipText = true,
diff --git a/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs b/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs
index 252c6aa012..e336bb73a6 100644
--- a/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs
+++ b/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs
@@ -15,6 +15,7 @@ using Robust.Shared.Localization;
using Robust.Shared.Maths;
using Robust.Shared.Prototypes;
using static Robust.Client.UserInterface.Controls.BaseButton;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Kitchen.UI
{
@@ -165,9 +166,9 @@ namespace Content.Client.Kitchen.UI
public ButtonGroup CookTimeButtonGroup { get; }
- public VBoxContainer CookTimeButtonVbox { get; }
+ public BoxContainer CookTimeButtonVbox { get; }
- private VBoxContainer ButtonGridContainer { get; }
+ private BoxContainer ButtonGridContainer { get; }
private PanelContainer DisableCookingPanelOverlay { get; }
@@ -188,7 +189,10 @@ namespace Content.Client.Kitchen.UI
PanelOverride = new StyleBoxFlat {BackgroundColor = Color.Black.WithAlpha(0.60f)},
};
- var hSplit = new HBoxContainer();
+ var hSplit = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Horizontal
+ };
IngredientsListReagents = new ItemList
{
@@ -217,17 +221,19 @@ namespace Content.Client.Kitchen.UI
hSplit.AddChild(IngredientsList);
- var vSplit = new VBoxContainer
+ var vSplit = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
VerticalExpand = true,
HorizontalExpand = true,
};
hSplit.AddChild(vSplit);
- ButtonGridContainer = new VBoxContainer
+ ButtonGridContainer = new BoxContainer
{
- Align = BoxContainer.AlignMode.Center,
+ Orientation = LayoutOrientation.Vertical,
+ Align = AlignMode.Center,
SizeFlagsStretchRatio = 3
};
@@ -255,10 +261,11 @@ namespace Content.Client.Kitchen.UI
});
CookTimeButtonGroup = new ButtonGroup();
- CookTimeButtonVbox = new VBoxContainer
+ CookTimeButtonVbox = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
VerticalExpand = true,
- Align = BoxContainer.AlignMode.Center,
+ Align = AlignMode.Center,
};
var index = 0;
@@ -301,8 +308,9 @@ namespace Content.Client.Kitchen.UI
Children =
{
- new VBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
Children =
{
new PanelContainer
diff --git a/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs b/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs
index 57bf60156b..e33cae9e5e 100644
--- a/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs
+++ b/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs
@@ -11,6 +11,7 @@ using Robust.Shared.Localization;
using Robust.Shared.Maths;
using Robust.Shared.Prototypes;
using static Content.Shared.Chemistry.Solution.Solution;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Kitchen.UI
{
@@ -238,10 +239,14 @@ namespace Content.Client.Kitchen.UI
Owner = owner;
Title = Loc.GetString("grinder-menu-title");
- var hSplit = new HBoxContainer();
-
- var vBoxGrindJuiceButtonPanel = new VBoxContainer
+ var hSplit = new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal
+ };
+
+ var vBoxGrindJuiceButtonPanel = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Vertical,
VerticalAlignment = VAlignment.Center
};
diff --git a/Content.Client/LateJoin/LateJoinGui.cs b/Content.Client/LateJoin/LateJoinGui.cs
index 780461f5bc..77e6d0f09d 100644
--- a/Content.Client/LateJoin/LateJoinGui.cs
+++ b/Content.Client/LateJoin/LateJoinGui.cs
@@ -16,6 +16,7 @@ using Robust.Shared.Log;
using Robust.Shared.Maths;
using Robust.Shared.Prototypes;
using Robust.Shared.Utility;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.LateJoin
{
@@ -27,7 +28,7 @@ namespace Content.Client.LateJoin
public event Action? SelectedId;
private readonly Dictionary _jobButtons = new();
- private readonly Dictionary _jobCategories = new();
+ private readonly Dictionary _jobCategories = new();
public LateJoinGui()
{
@@ -38,9 +39,13 @@ namespace Content.Client.LateJoin
Title = Loc.GetString("late-join-gui-title");
- var jobList = new VBoxContainer();
- var vBox = new VBoxContainer
+ var jobList = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical
+ };
+ var vBox = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Vertical,
Children =
{
new ScrollContainer
@@ -64,8 +69,9 @@ namespace Content.Client.LateJoin
{
if (!_jobCategories.TryGetValue(department, out var category))
{
- category = new VBoxContainer
+ category = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
Name = department,
ToolTip = Loc.GetString("late-join-gui-jobs-amount-in-department-tooltip",
("departmentName", department))
@@ -101,8 +107,9 @@ namespace Content.Client.LateJoin
var jobButton = new JobButton(job.ID);
- var jobSelector = new HBoxContainer
+ var jobSelector = new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
HorizontalExpand = true
};
diff --git a/Content.Client/Lathe/UI/LatheMenu.cs b/Content.Client/Lathe/UI/LatheMenu.cs
index 38bde6c6ca..12c6872156 100644
--- a/Content.Client/Lathe/UI/LatheMenu.cs
+++ b/Content.Client/Lathe/UI/LatheMenu.cs
@@ -8,6 +8,7 @@ using Robust.Client.UserInterface.CustomControls;
using Robust.Client.Utility;
using Robust.Shared.IoC;
using Robust.Shared.Prototypes;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Lathe.UI
{
@@ -36,14 +37,16 @@ namespace Content.Client.Lathe.UI
Title = "Lathe Menu";
- var vBox = new VBoxContainer()
+ var vBox = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
VerticalExpand = true,
SeparationOverride = 5,
};
- var hBoxButtons = new HBoxContainer()
+ var hBoxButtons = new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
HorizontalExpand = true,
VerticalExpand = true,
SizeFlagsStretchRatio = 1,
@@ -76,8 +79,9 @@ namespace Content.Client.Lathe.UI
SizeFlagsStretchRatio = 3,
};
- var hBoxFilter = new HBoxContainer()
+ var hBoxFilter = new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
HorizontalExpand = true,
VerticalExpand = true,
SizeFlagsStretchRatio = 1
diff --git a/Content.Client/Lathe/UI/LatheQueueMenu.cs b/Content.Client/Lathe/UI/LatheQueueMenu.cs
index eeabc96772..7c5cbcc8fb 100644
--- a/Content.Client/Lathe/UI/LatheQueueMenu.cs
+++ b/Content.Client/Lathe/UI/LatheQueueMenu.cs
@@ -5,6 +5,7 @@ using Robust.Client.UserInterface.CustomControls;
using Robust.Client.Utility;
using Robust.Shared.Localization;
using Robust.Shared.ViewVariables;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Lathe.UI
{
@@ -24,10 +25,14 @@ namespace Content.Client.Lathe.UI
SetSize = MinSize = (300, 450);
Title = Loc.GetString("lathequeue-menu-title");
- var vBox = new VBoxContainer();
-
- var hBox = new HBoxContainer()
+ var vBox = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical
+ };
+
+ var hBox = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Horizontal,
HorizontalExpand = true,
SizeFlagsStretchRatio = 2,
};
@@ -38,8 +43,9 @@ namespace Content.Client.Lathe.UI
SizeFlagsStretchRatio = 2,
};
- var vBoxInfo = new VBoxContainer()
+ var vBoxInfo = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
VerticalExpand = true,
SizeFlagsStretchRatio = 3,
};
diff --git a/Content.Client/Launcher/LauncherConnectingGui.xaml b/Content.Client/Launcher/LauncherConnectingGui.xaml
index f879c5ff73..2d4aa5f1cb 100644
--- a/Content.Client/Launcher/LauncherConnectingGui.xaml
+++ b/Content.Client/Launcher/LauncherConnectingGui.xaml
@@ -6,48 +6,48 @@
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
diff --git a/Content.Client/Light/Components/HandheldLightComponent.cs b/Content.Client/Light/Components/HandheldLightComponent.cs
index 707d5f8bb4..e2dfa67dbc 100644
--- a/Content.Client/Light/Components/HandheldLightComponent.cs
+++ b/Content.Client/Light/Components/HandheldLightComponent.cs
@@ -7,6 +7,7 @@ using Robust.Shared.GameObjects;
using Robust.Shared.Maths;
using Robust.Shared.Timing;
using Robust.Shared.ViewVariables;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Light.Components
{
@@ -55,8 +56,9 @@ namespace Content.Client.Light.Components
{
_parent = parent;
- var wrapper = new HBoxContainer
+ var wrapper = new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
SeparationOverride = 4,
HorizontalAlignment = HAlignment.Center
};
diff --git a/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs b/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs
index 06d23ec908..45b66fd40e 100644
--- a/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs
+++ b/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs
@@ -16,6 +16,7 @@ using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.Shared.Prototypes;
using static Content.Shared.Inventory.EquipmentSlotDefines;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Lobby.UI
{
@@ -24,7 +25,7 @@ namespace Content.Client.Lobby.UI
private readonly IClientPreferencesManager _preferencesManager;
private IEntity _previewDummy;
private readonly Label _summaryLabel;
- private readonly VBoxContainer _loaded;
+ private readonly BoxContainer _loaded;
private readonly Label _unloaded;
public LobbyCharacterPreviewPanel(IEntityManager entityManager,
@@ -51,18 +52,28 @@ namespace Content.Client.Lobby.UI
var viewWest = MakeSpriteView(_previewDummy, Direction.West);
var viewEast = MakeSpriteView(_previewDummy, Direction.East);
- var vBox = new VBoxContainer();
+ var vBox = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Vertical
+ };
vBox.AddChild(header);
_unloaded = new Label {Text = Loc.GetString("lobby-character-preview-panel-unloaded-preferences-label")};
- _loaded = new VBoxContainer {Visible = false};
+ _loaded = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Vertical,
+ Visible = false
+ };
_loaded.AddChild(CharacterSetupButton);
_loaded.AddChild(_summaryLabel);
- var hBox = new HBoxContainer();
+ var hBox = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Horizontal
+ };
hBox.AddChild(viewSouth);
hBox.AddChild(viewNorth);
hBox.AddChild(viewWest);
diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml b/Content.Client/Lobby/UI/LobbyGui.xaml
index 71501731f4..e047a9cf6a 100644
--- a/Content.Client/Lobby/UI/LobbyGui.xaml
+++ b/Content.Client/Lobby/UI/LobbyGui.xaml
@@ -18,9 +18,9 @@
-
+
-
+
@@ -28,7 +28,7 @@
-
+
@@ -37,20 +37,20 @@
-
+
-
+
-
+
-
+
-
+
@@ -67,7 +67,7 @@
-
+
-
+
-
+
-
-
+
+
diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml.cs b/Content.Client/Lobby/UI/LobbyGui.xaml.cs
index a4bea076ff..f96344daa7 100644
--- a/Content.Client/Lobby/UI/LobbyGui.xaml.cs
+++ b/Content.Client/Lobby/UI/LobbyGui.xaml.cs
@@ -8,6 +8,7 @@ using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;
using Robust.Shared.GameObjects;
using Robust.Shared.Maths;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Lobby.UI
{
@@ -21,7 +22,7 @@ namespace Content.Client.Lobby.UI
public Button OptionsButton => COptionsButton;
public Button LeaveButton => CLeaveButton;
public ChatBox Chat => CChat;
- public VBoxContainer VoteContainer => CVoteContainer;
+ public BoxContainer VoteContainer => CVoteContainer;
public LobbyPlayerList OnlinePlayerList => COnlinePlayerList;
public ServerInfo ServerInfo => CServerInfo;
public LobbyCharacterPreviewPanel CharacterPreview { get; }
@@ -49,7 +50,7 @@ namespace Content.Client.Lobby.UI
public class LobbyPlayerList : Control
{
private readonly ScrollContainer _scroll;
- private readonly VBoxContainer _vBox;
+ private readonly BoxContainer _vBox;
public LobbyPlayerList()
{
@@ -57,7 +58,10 @@ namespace Content.Client.Lobby.UI
{
PanelOverride = new StyleBoxFlat {BackgroundColor = Color.FromHex("#202028")},
};
- _vBox = new VBoxContainer();
+ _vBox = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Vertical
+ };
_scroll = new ScrollContainer();
_scroll.AddChild(_vBox);
panel.AddChild(_scroll);
@@ -67,8 +71,9 @@ namespace Content.Client.Lobby.UI
// Adds a row
public void AddItem(string name, string status)
{
- var hbox = new HBoxContainer
+ var hbox = new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
HorizontalExpand = true,
};
diff --git a/Content.Client/MainMenu/MainMenu.cs b/Content.Client/MainMenu/MainMenu.cs
index 3cd942d225..0c4a791451 100644
--- a/Content.Client/MainMenu/MainMenu.cs
+++ b/Content.Client/MainMenu/MainMenu.cs
@@ -14,6 +14,7 @@ using Robust.Shared.Localization;
using Robust.Shared.Log;
using Robust.Shared.Network;
using Robust.Shared.Utility;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
using UsernameHelpers = Robust.Shared.AuthLib.UsernameHelpers;
namespace Content.Client.MainMenu
@@ -221,8 +222,9 @@ namespace Content.Client.MainMenu
var layout = new LayoutContainer();
AddChild(layout);
- var vBox = new VBoxContainer
+ var vBox = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
StyleIdentifier = "mainMenuVBox"
};
@@ -240,7 +242,11 @@ namespace Content.Client.MainMenu
};
vBox.AddChild(logo);
- var userNameHBox = new HBoxContainer {SeparationOverride = 4};
+ var userNameHBox = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Horizontal,
+ SeparationOverride = 4
+ };
vBox.AddChild(userNameHBox);
userNameHBox.AddChild(new Label {Text = Loc.GetString("main-menu-username-label") });
diff --git a/Content.Client/MedicalScanner/UI/MedicalScannerWindow.cs b/Content.Client/MedicalScanner/UI/MedicalScannerWindow.cs
index 5a51ee6f3f..2c42dc5fb9 100644
--- a/Content.Client/MedicalScanner/UI/MedicalScannerWindow.cs
+++ b/Content.Client/MedicalScanner/UI/MedicalScannerWindow.cs
@@ -6,6 +6,7 @@ using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using static Content.Shared.MedicalScanner.SharedMedicalScannerComponent;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.MedicalScanner.UI
{
@@ -17,8 +18,9 @@ namespace Content.Client.MedicalScanner.UI
{
SetSize = (250, 100);
- Contents.AddChild(new VBoxContainer
+ Contents.AddChild(new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
Children =
{
(ScanButton = new Button
diff --git a/Content.Client/PDA/PDABoundUserInterface.cs b/Content.Client/PDA/PDABoundUserInterface.cs
index b02cdfb52a..32e9e76ea3 100644
--- a/Content.Client/PDA/PDABoundUserInterface.cs
+++ b/Content.Client/PDA/PDABoundUserInterface.cs
@@ -14,6 +14,7 @@ using Robust.Shared.Localization;
using Robust.Shared.Maths;
using Robust.Shared.Prototypes;
using static Robust.Client.UserInterface.Controls.BaseButton;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.PDA
{
@@ -243,15 +244,15 @@ namespace Content.Client.PDA
public PanelContainer IDInfoContainer { get; }
public RichTextLabel IDInfoLabel { get; }
- public VBoxContainer UplinkTabContainer { get; }
+ public BoxContainer UplinkTabContainer { get; }
protected readonly HSplitContainer CategoryAndListingsContainer;
private readonly IPrototypeManager _prototypeManager;
- public readonly VBoxContainer UplinkListingsContainer;
+ public readonly BoxContainer UplinkListingsContainer;
- public readonly VBoxContainer CategoryListContainer;
+ public readonly BoxContainer CategoryListContainer;
public readonly RichTextLabel BalanceInfo;
public event Action? OnListingButtonPressed;
public event Action? OnCategoryButtonPressed;
@@ -311,8 +312,9 @@ namespace Content.Client.PDA
VerticalAlignment = VAlignment.Center
};
- var innerHBoxContainer = new HBoxContainer
+ var innerHBoxContainer = new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
IDInfoLabel,
@@ -335,8 +337,9 @@ namespace Content.Client.PDA
ToggleMode = true,
};
- var mainMenuTabContainer = new VBoxContainer
+ var mainMenuTabContainer = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
VerticalExpand = true,
HorizontalExpand = true,
MinSize = (50, 50),
@@ -353,8 +356,9 @@ namespace Content.Client.PDA
#region UPLINK_TAB
//Uplink Tab
- CategoryListContainer = new VBoxContainer
+ CategoryListContainer = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical
};
BalanceInfo = new RichTextLabel
@@ -400,8 +404,9 @@ namespace Content.Client.PDA
masterPanelContainer.AddChild(CategoryAndListingsContainer);
//Actual list of buttons for buying a listing from the uplink.
- UplinkListingsContainer = new VBoxContainer
+ UplinkListingsContainer = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
HorizontalExpand = true,
VerticalExpand = true,
SizeFlagsStretchRatio = 2,
@@ -409,8 +414,9 @@ namespace Content.Client.PDA
};
uplinkShopScrollContainer.AddChild(UplinkListingsContainer);
- var innerVboxContainer = new VBoxContainer
+ var innerVboxContainer = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
VerticalExpand = true,
Children =
@@ -420,8 +426,9 @@ namespace Content.Client.PDA
}
};
- UplinkTabContainer = new VBoxContainer
+ UplinkTabContainer = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
Children =
{
innerVboxContainer
@@ -495,14 +502,16 @@ namespace Content.Client.PDA
};
//Padding for the price lable.
- var pricePadding = new HBoxContainer
+ var pricePadding = new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
MinSize = (32, 1),
};
//Contains the name of the item and its price. Used for spacing item name and price.
- var listingButtonHbox = new HBoxContainer
+ var listingButtonHbox = new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
itemLabel,
diff --git a/Content.Client/Paper/UI/PaperWindow.cs b/Content.Client/Paper/UI/PaperWindow.cs
index 6a0c01c083..946aae3354 100644
--- a/Content.Client/Paper/UI/PaperWindow.cs
+++ b/Content.Client/Paper/UI/PaperWindow.cs
@@ -2,6 +2,7 @@
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
using Robust.Shared.Utility;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Paper.UI
{
@@ -13,7 +14,10 @@ namespace Content.Client.Paper.UI
public PaperWindow()
{
MinSize = SetSize = (300, 300);
- var container = new VBoxContainer();
+ var container = new BoxContainer
+ {
+ Orientation = LayoutOrientation.Vertical
+ };
_label = new RichTextLabel();
Input = new LineEdit {Visible = false};
container.AddChild(_label);
diff --git a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs
index b37cf86384..d7c41f53ce 100644
--- a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs
+++ b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs
@@ -15,6 +15,7 @@ using Robust.Shared.Maths;
using Robust.Shared.Noise;
using Robust.Shared.Prototypes;
using Robust.Shared.Timing;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.ParticleAccelerator.UI
{
@@ -32,7 +33,7 @@ namespace Content.Client.ParticleAccelerator.UI
private readonly Label _statusLabel;
private readonly SpinBox _stateSpinBox;
- private readonly VBoxContainer _alarmControl;
+ private readonly BoxContainer _alarmControl;
private readonly Animation _alarmControlAnimation;
private readonly PASegmentControl _endCapTexture;
@@ -138,8 +139,9 @@ namespace Content.Client.ParticleAccelerator.UI
};
_drawLabel = new Label();
var imgSize = new Vector2(32, 32);
- AddChild(new VBoxContainer
+ AddChild(new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
Children =
{
new Control
@@ -166,19 +168,22 @@ namespace Content.Client.ParticleAccelerator.UI
MinSize = (0, 4)
},
- new HBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
VerticalExpand = true,
Children =
{
- new VBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
Margin = new Thickness(4, 0, 0, 0),
HorizontalExpand = true,
Children =
{
- new HBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
new Label
@@ -191,8 +196,9 @@ namespace Content.Client.ParticleAccelerator.UI
_onButton
}
},
- new HBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Children =
{
new Label
@@ -213,8 +219,9 @@ namespace Content.Client.ParticleAccelerator.UI
{
VerticalExpand = true,
},
- (_alarmControl = new VBoxContainer
+ (_alarmControl = new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
Children =
{
new Label
@@ -228,8 +235,9 @@ namespace Content.Client.ParticleAccelerator.UI
}),
}
},
- new VBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Vertical,
MinSize = (186, 0),
Children =
{
@@ -292,8 +300,9 @@ namespace Content.Client.ParticleAccelerator.UI
}
}
},
- new HBoxContainer
+ new BoxContainer
{
+ Orientation = LayoutOrientation.Horizontal,
Margin = new Thickness(12, 0, 0, 0),
Children =
{
diff --git a/Content.Client/Power/APC/ApcBoundUserInterface.cs b/Content.Client/Power/APC/ApcBoundUserInterface.cs
index 0df4379d78..fd4724c544 100644
--- a/Content.Client/Power/APC/ApcBoundUserInterface.cs
+++ b/Content.Client/Power/APC/ApcBoundUserInterface.cs
@@ -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
{
diff --git a/Content.Client/Power/SolarControlWindow.xaml b/Content.Client/Power/SolarControlWindow.xaml
index a51f57154c..8918a87d1b 100644
--- a/Content.Client/Power/SolarControlWindow.xaml
+++ b/Content.Client/Power/SolarControlWindow.xaml
@@ -2,7 +2,7 @@
xmlns:scc="clr-namespace:Content.Client.GameObjects.Components.Power"
Title="{Loc 'solar-control-window-title'}"
Resizable="False">
-
+