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

26
Content.Client/Lobby/UI/LobbyGui.xaml
View File

@@ -18,9 +18,9 @@
<MarginContainer MarginBottomOverride="20" MarginLeftOverride="20" MarginRightOverride="20"
MarginTopOverride="20">
<PanelContainer StyleClasses="AngleRect" />
<VBoxContainer>
<BoxContainer Orientation="Vertical">
<!-- Top row -->
<HBoxContainer MinSize="0 40">
<BoxContainer Orientation="Horizontal" MinSize="0 40">
<MarginContainer MarginLeftOverride="8">
<Label StyleClasses="LabelHeadingBigger" VAlign="Center" Text="{Loc 'Lobby'}" />
</MarginContainer>
@@ -28,7 +28,7 @@
<ui:VoteCallMenuButton Name="CCallVoteButton" StyleClasses="ButtonBig" />
<Button Name="COptionsButton" StyleClasses="ButtonBig" Text="{Loc 'Options'}" />
<Button Name="CLeaveButton" StyleClasses="ButtonBig" Text="{Loc 'Leave'}" />
</HBoxContainer>
</BoxContainer>
<!-- Gold line -->
<PanelContainer>
<PanelContainer.PanelOverride>
@@ -37,20 +37,20 @@
</PanelContainer.PanelOverride>
</PanelContainer>
<!-- Middle section with the two vertical panels -->
<HBoxContainer VerticalExpand="True">
<BoxContainer Orientation="Horizontal" VerticalExpand="True">
<!-- Left panel -->
<VBoxContainer Name="CLeftPanelContainer" HorizontalExpand="True">
<BoxContainer Orientation="Vertical" Name="CLeftPanelContainer" HorizontalExpand="True">
<hudUi:StripeBack>
<MarginContainer MarginLeftOverride="3" MarginRightOverride="3" MarginBottomOverride="3"
MarginTopOverride="3">
<HBoxContainer SeparationOverride="6">
<BoxContainer Orientation="Horizontal" SeparationOverride="6">
<Button Name="CObserveButton" Text="{Loc 'Observe'}" StyleClasses="ButtonBig" />
<Label Name="CStartTime" Align="Right"
FontColorOverride="{x:Static maths:Color.DarkGray}"
StyleClasses="LabelBig" HorizontalExpand="True" />
<Button Name="CReadyButton" ToggleMode="True" Text="{Loc 'Ready Up'}"
StyleClasses="ButtonBig" />
</HBoxContainer>
</BoxContainer>
</MarginContainer>
</hudUi:StripeBack>
<MarginContainer VerticalExpand="True" MarginLeftOverride="3" MarginRightOverride="3"
@@ -58,7 +58,7 @@
MarginTopOverride="3">
<chatUi:ChatBox Name="CChat" />
</MarginContainer>
</VBoxContainer>
</BoxContainer>
<!-- Gold line -->
<PanelContainer MinSize="2 0">
<PanelContainer.PanelOverride>
@@ -67,7 +67,7 @@
</PanelContainer>
<!-- Right panel -->
<Control HorizontalExpand="True">
<VBoxContainer>
<BoxContainer Orientation="Vertical">
<!-- Player list -->
<hudUi:NanoHeading Text="{Loc 'Online Players'}" />
<MarginContainer VerticalExpand="True"
@@ -84,13 +84,13 @@
MarginBottomOverride="2" MarginTopOverride="3">
<info:ServerInfo Name="CServerInfo" />
</MarginContainer>
</VBoxContainer>
</BoxContainer>
<MarginContainer SizeFlagsHorizontal="ShrinkEnd" MarginTopOverride="8" MarginRightOverride="8">
<VBoxContainer Name="CVoteContainer" />
<BoxContainer Orientation="Vertical" Name="CVoteContainer" />
</MarginContainer>
</Control>
</HBoxContainer>
</VBoxContainer>
</BoxContainer>
</BoxContainer>
</MarginContainer>
</Control>