From a0a5dcdfde53e6ed2986172c9e6b04d43fc7cecc Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Wed, 21 Jul 2021 15:15:02 +0200
Subject: [PATCH] Clean up vote XAML a bit.

Remove deprecated UI things from it, give vote popup a MinWidth.
---
 Content.Client/Voting/UI/VoteCallMenu.xaml | 38 ++++++++--------------
 Content.Client/Voting/UI/VotePopup.xaml    | 23 +++++--------
 2 files changed, 22 insertions(+), 39 deletions(-)

diff --git a/Content.Client/Voting/UI/VoteCallMenu.xaml b/Content.Client/Voting/UI/VoteCallMenu.xaml
index 98478b1439..5ff1015dbb 100644
--- a/Content.Client/Voting/UI/VoteCallMenu.xaml
+++ b/Content.Client/Voting/UI/VoteCallMenu.xaml
@@ -4,36 +4,24 @@
                  MouseFilter="Stop" MinSize="350 150">
     <PanelContainer StyleClasses="AngleRect" />
     <BoxContainer Orientation="Vertical">
-        <BoxContainer Orientation="Horizontal">
-            <MarginContainer MarginLeftOverride="8" HorizontalExpand="True">
-                <Label Text="{Loc 'ui-vote-create-title'}" VAlign="Center" StyleClasses="LabelHeading" />
-            </MarginContainer>
-            <MarginContainer MarginRightOverride="8">
-                <TextureButton Name="CloseButton" StyleClasses="windowCloseButton"
-                               SizeFlagsVertical="ShrinkCenter" />
-            </MarginContainer>
+        <BoxContainer Margin="8 0" Orientation="Horizontal">
+            <Label Text="{Loc 'ui-vote-create-title'}"
+                   HorizontalExpand="True" VAlign="Center" StyleClasses="LabelHeading" />
+            <TextureButton Name="CloseButton" StyleClasses="windowCloseButton"
+                           VerticalAlignment="Center" />
         </BoxContainer>
         <hudUi:HighDivider />
 
-        <MarginContainer SizeFlagsHorizontal="Fill" SizeFlagsVertical="Expand"
-                         MarginLeftOverride="8" MarginRightOverride="8" MarginTopOverride="2">
-            <BoxContainer Orientation="Horizontal">
-                <OptionButton Name="VoteTypeButton" HorizontalExpand="True" />
-                <Control HorizontalExpand="True">
-                    <OptionButton Name="VoteSecondButton" Visible="False" />
-                </Control>
-            </BoxContainer>
-        </MarginContainer>
+        <BoxContainer Margin="8 2 8 0" VerticalExpand="True" VerticalAlignment="Top" Orientation="Horizontal">
+            <OptionButton Name="VoteTypeButton" HorizontalExpand="True" />
+            <Control HorizontalExpand="True">
+                <OptionButton Name="VoteSecondButton" Visible="False" />
+            </Control>
+        </BoxContainer>
 
-        <MarginContainer SizeFlagsHorizontal="Fill"
-                         MarginLeftOverride="8" MarginRightOverride="8" MarginBottomOverride="2">
-            <Button Name="CreateButton" Text="{Loc 'ui-vote-create-button'}" />
-        </MarginContainer>
+        <Button Margin="8 2" Name="CreateButton" Text="{Loc 'ui-vote-create-button'}" />
 
         <PanelContainer StyleClasses="LowDivider" />
-        <MarginContainer MarginLeftOverride="12">
-            <Label StyleClasses="LabelSubText" Text="{Loc 'ui-vote-fluff'}" />
-        </MarginContainer>
-
+        <Label Margin="12 0 0 0" StyleClasses="LabelSubText" Text="{Loc 'ui-vote-fluff'}" />
     </BoxContainer>
 </ui:VoteCallMenu>
diff --git a/Content.Client/Voting/UI/VotePopup.xaml b/Content.Client/Voting/UI/VotePopup.xaml
index cc98a16095..39817bd553 100644
--- a/Content.Client/Voting/UI/VotePopup.xaml
+++ b/Content.Client/Voting/UI/VotePopup.xaml
@@ -1,18 +1,13 @@
-<Control xmlns="https://spacestation14.io">
+<Control xmlns="https://spacestation14.io" MinWidth="300">
     <PanelContainer StyleClasses="AngleRect" />
-    <MarginContainer MarginLeftOverride="4" MarginRightOverride="4" MarginTopOverride="4" MarginBottomOverride="4">
-        <BoxContainer Orientation="Vertical">
-            <Label Name="VoteCaller" />
-            <Label Name="VoteTitle" />
+    <BoxContainer Margin="4" Orientation="Vertical">
+        <Label Name="VoteCaller" />
+        <Label Name="VoteTitle" />
 
-            <GridContainer Columns="3" Name="VoteOptionsContainer" />
-            <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" />
-            </BoxContainer>
+        <GridContainer Columns="3" Name="VoteOptionsContainer" />
+        <BoxContainer Orientation="Horizontal">
+            <ProgressBar Margin="4" HorizontalExpand="True" Name="TimeLeftBar" MinValue="0" MaxValue="1" />
+            <Label Name="TimeLeftText" />
         </BoxContainer>
-    </MarginContainer>
+    </BoxContainer>
 </Control>