Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 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

12
Content.Client/Voting/UI/VoteCallMenu.xaml
View File

@@ -3,8 +3,8 @@
xmlns:hudUi="clr-namespace:Content.Client.HUD.UI"
MouseFilter="Stop" MinSize="350 150">
<PanelContainer StyleClasses="AngleRect" />
<VBoxContainer>
<HBoxContainer>
<BoxContainer Orientation="Vertical">
<BoxContainer Orientation="Horizontal">
<MarginContainer MarginLeftOverride="8" HorizontalExpand="True">
<Label Text="{Loc 'ui-vote-create-title'}" VAlign="Center" StyleClasses="LabelHeading" />
</MarginContainer>
@@ -12,17 +12,17 @@
<TextureButton Name="CloseButton" StyleClasses="windowCloseButton"
SizeFlagsVertical="ShrinkCenter" />
</MarginContainer>
</HBoxContainer>
</BoxContainer>
<hudUi:HighDivider />
<MarginContainer SizeFlagsHorizontal="Fill" SizeFlagsVertical="Expand"
MarginLeftOverride="8" MarginRightOverride="8" MarginTopOverride="2">
<HBoxContainer>
<BoxContainer Orientation="Horizontal">
<OptionButton Name="VoteTypeButton" HorizontalExpand="True" />
<Control HorizontalExpand="True">
<OptionButton Name="VoteSecondButton" Visible="False" />
</Control>
</HBoxContainer>
</BoxContainer>
</MarginContainer>
<MarginContainer SizeFlagsHorizontal="Fill"
@@ -35,5 +35,5 @@
<Label StyleClasses="LabelSubText" Text="{Loc 'ui-vote-fluff'}" />
</MarginContainer>
</VBoxContainer>
</BoxContainer>
</ui:VoteCallMenu>

8
Content.Client/Voting/UI/VotePopup.xaml
View File

@@ -1,18 +1,18 @@
<Control xmlns="https://spacestation14.io">
<PanelContainer StyleClasses="AngleRect" />
<MarginContainer MarginLeftOverride="4" MarginRightOverride="4" MarginTopOverride="4" MarginBottomOverride="4">
<VBoxContainer>
<BoxContainer Orientation="Vertical">
<Label Name="VoteCaller" />
<Label Name="VoteTitle" />
<GridContainer Columns="3" Name="VoteOptionsContainer" />
<HBoxContainer>
<BoxContainer Orientation="Horizontal">
<MarginContainer HorizontalExpand="True" MarginLeftOverride="2" MarginRightOverride="2"
MarginTopOverride="2" MarginBottomOverride="2">
<ProgressBar Name="TimeLeftBar" MinValue="0" MaxValue="1" />
</MarginContainer>
<Label Name="TimeLeftText" />
</HBoxContainer>
</VBoxContainer>
</BoxContainer>
</BoxContainer>
</MarginContainer>
</Control>