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

Remove last usage of MarginContainer (#4659)

Browse Source 
* Remove usage of MarginContainer

* Fix margin
This commit is contained in:
Visne
2021-09-20 08:40:03 +02:00
committed by GitHub
parent 00b31d21f5
commit 3895266b1f
1 changed files with 20 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,21 +9,16 @@
xmlns:chatUi="clr-namespace:Content.Client.Chat.UI" xmlns:chatUi="clr-namespace:Content.Client.Chat.UI"
xmlns:lobbyUi="clr-namespace:Content.Client.Lobby.UI" xmlns:lobbyUi="clr-namespace:Content.Client.Lobby.UI"
xmlns:info="clr-namespace:Content.Client.Info"> xmlns:info="clr-namespace:Content.Client.Info">
<Control> <Control>
<!-- Parallax background --> <!-- Parallax background -->
<parallax:ParallaxControl /> <parallax:ParallaxControl />
<!-- One day I'll code a Margin property for controls. --> <Control Margin="20 20 20 20">
<MarginContainer MarginBottomOverride="20" MarginLeftOverride="20" MarginRightOverride="20"
MarginTopOverride="20">
<PanelContainer StyleClasses="AngleRect" /> <PanelContainer StyleClasses="AngleRect" />
<BoxContainer Orientation="Vertical"> <BoxContainer Orientation="Vertical">
<!-- Top row --> <!-- Top row -->
<BoxContainer Orientation="Horizontal" MinSize="0 40"> <BoxContainer Orientation="Horizontal" MinSize="0 40">
<MarginContainer MarginLeftOverride="8"> <Label Margin="8 0 0 0" StyleClasses="LabelHeadingBigger" VAlign="Center" Text="{Loc 'Lobby'}" />
<Label StyleClasses="LabelHeadingBigger" VAlign="Center" Text="{Loc 'Lobby'}" />
</MarginContainer>
<Label Name="CServerName" StyleClasses="LabelHeadingBigger" VAlign="Center" /> <Label Name="CServerName" StyleClasses="LabelHeadingBigger" VAlign="Center" />
<ui:VoteCallMenuButton Name="CCallVoteButton" StyleClasses="ButtonBig" /> <ui:VoteCallMenuButton Name="CCallVoteButton" StyleClasses="ButtonBig" />
<Button Name="COptionsButton" StyleClasses="ButtonBig" Text="{Loc 'Options'}" /> <Button Name="COptionsButton" StyleClasses="ButtonBig" Text="{Loc 'Options'}" />
@@ -41,23 +36,16 @@
<!-- Left panel --> <!-- Left panel -->
<BoxContainer Orientation="Vertical" Name="CLeftPanelContainer" HorizontalExpand="True"> <BoxContainer Orientation="Vertical" Name="CLeftPanelContainer" HorizontalExpand="True">
<hudUi:StripeBack> <hudUi:StripeBack>
<MarginContainer MarginLeftOverride="3" MarginRightOverride="3" MarginBottomOverride="3" <BoxContainer Orientation="Horizontal" SeparationOverride="6" Margin="3 3 3 3">
MarginTopOverride="3"> <Button Name="CObserveButton" Text="{Loc 'Observe'}" StyleClasses="ButtonBig" />
<BoxContainer Orientation="Horizontal" SeparationOverride="6"> <Label Name="CStartTime" Align="Right"
<Button Name="CObserveButton" Text="{Loc 'Observe'}" StyleClasses="ButtonBig" /> FontColorOverride="{x:Static maths:Color.DarkGray}"
<Label Name="CStartTime" Align="Right" StyleClasses="LabelBig" HorizontalExpand="True" />
FontColorOverride="{x:Static maths:Color.DarkGray}" <Button Name="CReadyButton" ToggleMode="True" Text="{Loc 'Ready Up'}"
StyleClasses="LabelBig" HorizontalExpand="True" /> StyleClasses="ButtonBig" />
<Button Name="CReadyButton" ToggleMode="True" Text="{Loc 'Ready Up'}" </BoxContainer>
StyleClasses="ButtonBig" />
</BoxContainer>
</MarginContainer>
</hudUi:StripeBack> </hudUi:StripeBack>
<MarginContainer VerticalExpand="True" MarginLeftOverride="3" MarginRightOverride="3" <chatUi:ChatBox Name="CChat" VerticalExpand="True" Margin="3 3 3 3"/>
MarginBottomOverride="3"
MarginTopOverride="3">
<chatUi:ChatBox Name="CChat" />
</MarginContainer>
</BoxContainer> </BoxContainer>
<!-- Gold line --> <!-- Gold line -->
<PanelContainer MinSize="2 0"> <PanelContainer MinSize="2 0">
@@ -70,28 +58,21 @@
<BoxContainer Orientation="Vertical"> <BoxContainer Orientation="Vertical">
<!-- Player list --> <!-- Player list -->
<hudUi:NanoHeading Text="{Loc 'Online Players'}" /> <hudUi:NanoHeading Text="{Loc 'Online Players'}" />
<MarginContainer VerticalExpand="True" <lobbyUi:LobbyPlayerList Name="COnlinePlayerList"
MarginRightOverride="3" MarginLeftOverride="3"
MarginBottomOverride="3" MarginTopOverride="3">
<lobbyUi:LobbyPlayerList Name="COnlinePlayerList"
HorizontalExpand="True" HorizontalExpand="True"
VerticalExpand="True" /> VerticalExpand="True"
</MarginContainer> Margin="3 3 3 3" />
<!-- Server info --> <!-- Server info -->
<hudUi:NanoHeading Text="{Loc 'Server Info'}" /> <hudUi:NanoHeading Text="{Loc 'Server Info'}" />
<MarginContainer VerticalExpand="True" <info:ServerInfo Name="CServerInfo" VerticalExpand="True" Margin="3 3 3 3"/>
MarginRightOverride="3" MarginLeftOverride="3"
MarginBottomOverride="2" MarginTopOverride="3">
<info:ServerInfo Name="CServerInfo" />
</MarginContainer>
</BoxContainer> </BoxContainer>
<MarginContainer SizeFlagsHorizontal="ShrinkEnd" MarginTopOverride="8" MarginRightOverride="8"> <BoxContainer Orientation="Vertical"
<BoxContainer Orientation="Vertical" Name="CVoteContainer" /> Name="CVoteContainer"
</MarginContainer> HorizontalAlignment="Right"
Margin="0 8 8 0" />
</Control> </Control>
</BoxContainer> </BoxContainer>
</BoxContainer> </BoxContainer>
</MarginContainer> </Control>
</Control> </Control>
</Control> </Control>