tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up vote XAML a bit.

Browse Source 
Remove deprecated UI things from it, give vote popup a MinWidth.
This commit is contained in:
Pieter-Jan Briers
2021-07-21 15:15:02 +02:00
parent 39801372be
commit a0a5dcdfde
2 changed files with 22 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,36 +4,24 @@
MouseFilter="Stop" MinSize="350 150"> MouseFilter="Stop" MinSize="350 150">
<PanelContainer StyleClasses="AngleRect" /> <PanelContainer StyleClasses="AngleRect" />
<BoxContainer Orientation="Vertical"> <BoxContainer Orientation="Vertical">
<BoxContainer Orientation="Horizontal"> <BoxContainer Margin="8 0" Orientation="Horizontal">
<MarginContainer MarginLeftOverride="8" HorizontalExpand="True"> <Label Text="{Loc 'ui-vote-create-title'}"
<Label Text="{Loc 'ui-vote-create-title'}" VAlign="Center" StyleClasses="LabelHeading" /> HorizontalExpand="True" VAlign="Center" StyleClasses="LabelHeading" />
</MarginContainer> <TextureButton Name="CloseButton" StyleClasses="windowCloseButton"
<MarginContainer MarginRightOverride="8"> VerticalAlignment="Center" />
<TextureButton Name="CloseButton" StyleClasses="windowCloseButton"
SizeFlagsVertical="ShrinkCenter" />
</MarginContainer>
</BoxContainer> </BoxContainer>
<hudUi:HighDivider /> <hudUi:HighDivider />
<MarginContainer SizeFlagsHorizontal="Fill" SizeFlagsVertical="Expand" <BoxContainer Margin="8 2 8 0" VerticalExpand="True" VerticalAlignment="Top" Orientation="Horizontal">
MarginLeftOverride="8" MarginRightOverride="8" MarginTopOverride="2"> <OptionButton Name="VoteTypeButton" HorizontalExpand="True" />
<BoxContainer Orientation="Horizontal"> <Control HorizontalExpand="True">
<OptionButton Name="VoteTypeButton" HorizontalExpand="True" /> <OptionButton Name="VoteSecondButton" Visible="False" />
<Control HorizontalExpand="True"> </Control>
<OptionButton Name="VoteSecondButton" Visible="False" /> </BoxContainer>
</Control>
</BoxContainer>
</MarginContainer>
<MarginContainer SizeFlagsHorizontal="Fill" <Button Margin="8 2" Name="CreateButton" Text="{Loc 'ui-vote-create-button'}" />
MarginLeftOverride="8" MarginRightOverride="8" MarginBottomOverride="2">
<Button Name="CreateButton" Text="{Loc 'ui-vote-create-button'}" />
</MarginContainer>
<PanelContainer StyleClasses="LowDivider" /> <PanelContainer StyleClasses="LowDivider" />
<MarginContainer MarginLeftOverride="12"> <Label Margin="12 0 0 0" StyleClasses="LabelSubText" Text="{Loc 'ui-vote-fluff'}" />
<Label StyleClasses="LabelSubText" Text="{Loc 'ui-vote-fluff'}" />
</MarginContainer>
</BoxContainer> </BoxContainer>
</ui:VoteCallMenu> </ui:VoteCallMenu>

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

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