From 553ca72c7485bf8e842a69f5a65f1d982032b670 Mon Sep 17 00:00:00 2001
From: Visne <39844191+Visne@users.noreply.github.com>
Date: Sun, 3 Oct 2021 13:37:52 +0200
Subject: [PATCH] Remove usages of SizeFlags (#4662)

* Remove usages of SizeFlags

* Remove defaults
---
 .../UI/CustomControls/PlayerListControl.xaml   | 18 +++++++++---------
 .../MagicMirrorBoundUserInterface.cs           |  2 +-
 Content.Client/Suspicion/SuspicionGui.xaml     |  2 +-
 Content.Client/Verbs/VerbSystem.cs             |  5 +----
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml
index 4007a99487..aedfcaa260 100644
--- a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml
+++ b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml
@@ -1,13 +1,13 @@
 <BoxContainer xmlns="https://spacestation14.io"
               Orientation="Vertical">
     <Control MinSize="0 5" />
-    <BoxContainer Orientation="Horizontal">
-        <!-- <Label Text="{Loc Search}" CustomMinimumSize="100 0" /> -->
-        <!-- <Control CustomMinimumSize="50 0" /> -->
-        <LineEdit Name="FilterLineEdit" MinSize="100 0" SizeFlagsHorizontal="FillExpand" PlaceHolder="{Loc Filter}"/>
-    </BoxContainer>
-    <!-- <Control CustomMinimumSize="0 5" /> -->
-    <ItemList
-        Name="PlayerItemList" SelectMode="Single" SizeFlagsVertical="FillExpand" SizeFlagsHorizontal="FillExpand"
-        MinSize="100 100" />
+    <LineEdit Name="FilterLineEdit"
+              MinSize="100 0"
+              HorizontalExpand="True"
+              PlaceHolder="{Loc Filter}"/>
+    <ItemList Name="PlayerItemList"
+              SelectMode="Single"
+              VerticalExpand="True"
+              HorizontalExpand="True"
+              MinSize="100 100" />
 </BoxContainer>
diff --git a/Content.Client/CharacterAppearance/MagicMirrorBoundUserInterface.cs b/Content.Client/CharacterAppearance/MagicMirrorBoundUserInterface.cs
index 1749ec46b8..4b186faed5 100644
--- a/Content.Client/CharacterAppearance/MagicMirrorBoundUserInterface.cs
+++ b/Content.Client/CharacterAppearance/MagicMirrorBoundUserInterface.cs
@@ -348,7 +348,7 @@ namespace Content.Client.CharacterAppearance
             _facialHairStylePicker.OnHairStylePicked += newStyle => owner.HairSelected(newStyle, true);
             _facialHairStylePicker.OnHairColorPicked += newColor => owner.HairColorSelected(newColor, true);
 
-            _eyeColorPicker = new EyeColorPicker {SizeFlagsHorizontal = SizeFlags.FillExpand};
+            _eyeColorPicker = new EyeColorPicker { HorizontalExpand = true };
             _eyeColorPicker.OnEyeColorPicked += newColor => owner.EyeColorSelected(newColor);
 
             Contents.AddChild(new BoxContainer
diff --git a/Content.Client/Suspicion/SuspicionGui.xaml b/Content.Client/Suspicion/SuspicionGui.xaml
index abe4aea834..85c0b42bc7 100644
--- a/Content.Client/Suspicion/SuspicionGui.xaml
+++ b/Content.Client/Suspicion/SuspicionGui.xaml
@@ -1,7 +1,7 @@
 <Control xmlns="https://spacestation14.io">
     <BoxContainer Orientation="Vertical" SeparationOverride="0">
         <Button Name="RoleButton">
-            <Label Name="TimerLabel" SizeFlagsHorizontal="ShrinkEnd" SizeFlagsVertical="ShrinkEnd" />
+            <Label Name="TimerLabel" HorizontalAlignment="Right" VerticalAlignment="Bottom" />
         </Button>
     </BoxContainer>
 </Control>
diff --git a/Content.Client/Verbs/VerbSystem.cs b/Content.Client/Verbs/VerbSystem.cs
index 4714562f3f..bc7ed79af0 100644
--- a/Content.Client/Verbs/VerbSystem.cs
+++ b/Content.Client/Verbs/VerbSystem.cs
@@ -434,10 +434,7 @@ namespace Content.Client.Verbs
                             Stretch = TextureRect.StretchMode.KeepCentered
                         }),
 
-                        (_label = new Label
-                        {
-                            SizeFlagsHorizontal = SizeFlags.FillExpand
-                        }),
+                        (_label = new Label { HorizontalExpand = true }),
 
                         // Padding
                         new Control {MinSize = (8, 0)},