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

Replace most VBox/HBoxContainers with BoxContainers (#4274)

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

10
Content.Client/Changelog/ChangelogWindow.xaml
View File

@@ -3,20 +3,20 @@
xmlns:ui="clr-namespace:Content.Client.HUD.UI"
MinSize="500 400" MouseFilter="Stop">
<PanelContainer StyleClasses="AngleRect" />
<VBoxContainer>
<HBoxContainer>
<BoxContainer Orientation="Vertical">
<BoxContainer Orientation="Horizontal">
<Label Margin="6 0 0 0" HorizontalExpand="True" Text="{Loc 'changelog-window-title'}" VAlign="Center"
StyleClasses="LabelHeading" />
<TextureButton Margin="0 0 8 0" Name="CloseButton" StyleClasses="windowCloseButton"
VerticalAlignment="Center" />
</HBoxContainer>
</BoxContainer>
<ui:HighDivider />
<ScrollContainer VerticalExpand="True" HScrollEnabled="False">
<VBoxContainer Name="ChangelogBody" />
<BoxContainer Orientation="Vertical" Name="ChangelogBody" />
</ScrollContainer>
<PanelContainer StyleClasses="LowDivider" />
<Label Name="VersionLabel" HorizontalAlignment="Right" StyleClasses="LabelSubText" Margin="4 0" />
</VBoxContainer>
</BoxContainer>
</changelog:ChangelogWindow>

14
Content.Client/Changelog/ChangelogWindow.xaml.cs
View File

@@ -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 =
{