WPF layout (#3346)

Content.Client/UserInterface/CharacterSetupGui.cs

@@ -36,12 +36,9 @@ namespace Content.Client.UserInterface
         {
             _entityManager = entityManager;
             _preferencesManager = preferencesManager;
-            var margin = new MarginContainer
+            var margin = new Control
             {
-                MarginBottomOverride = 20,
-                MarginLeftOverride = 20,
-                MarginRightOverride = 20,
-                MarginTopOverride = 20
+                Margin = new Thickness(20),
             };
 
             AddChild(margin);
@@ -67,32 +64,25 @@ namespace Content.Client.UserInterface
 
             var topHBox = new HBoxContainer
             {
-                CustomMinimumSize = (0, 40),
+                MinSize = (0, 40),
                 Children =
                 {
-                    new MarginContainer
+                    new Label
                     {
-                        MarginLeftOverride = 8,
-                        Children =
-                        {
-                            new Label
-                            {
-                                Text = Loc.GetString("Character Setup"),
-                                StyleClasses = {StyleNano.StyleClassLabelHeadingBigger},
-                                VAlign = Label.VAlignMode.Center,
-                                SizeFlagsHorizontal = SizeFlags.Expand | SizeFlags.ShrinkCenter
-                            }
-                        }
+                        Margin = new Thickness(8, 0, 0, 0),
+                        Text = Loc.GetString("Character Setup"),
+                        StyleClasses = {StyleNano.StyleClassLabelHeadingBigger},
+                        VAlign = Label.VAlignMode.Center,
                     },
                     (SaveButton = new Button
                     {
-                        SizeFlagsHorizontal = SizeFlags.Expand | SizeFlags.ShrinkEnd,
+                        HorizontalExpand = true,
+                        HorizontalAlignment = HAlignment.Right,
                         Text = Loc.GetString("Save"),
                         StyleClasses = {StyleNano.StyleClassButtonBig},
                     }),
                     (CloseButton = new Button
                     {
-                        SizeFlagsHorizontal = SizeFlags.ShrinkEnd,
                         Text = Loc.GetString("Close"),
                         StyleClasses = {StyleNano.StyleClassButtonBig},
                     })
@@ -112,29 +102,20 @@ namespace Content.Client.UserInterface
 
             var hBox = new HBoxContainer
             {
-                SizeFlagsVertical = SizeFlags.FillExpand,
+                VerticalExpand = true,
                 SeparationOverride = 0
             };
             vBox.AddChild(hBox);
 
             _charactersVBox = new VBoxContainer();
 
-            hBox.AddChild(new MarginContainer
+            hBox.AddChild(new ScrollContainer
             {
-                CustomMinimumSize = (330, 0),
-                SizeFlagsHorizontal = SizeFlags.Fill,
-                MarginTopOverride = 5,
-                MarginLeftOverride = 5,
+                MinSize = (325, 0),
+                Margin = new Thickness(5, 5, 0, 0),
                 Children =
                 {
-                    new ScrollContainer
-                    {
-                        SizeFlagsVertical = SizeFlags.FillExpand,
-                        Children =
-                        {
-                            _charactersVBox
-                        }
-                    }
+                    _charactersVBox
                 }
             });
 
@@ -152,7 +133,7 @@ namespace Content.Client.UserInterface
             hBox.AddChild(new PanelContainer
             {
                 PanelOverride = new StyleBoxFlat {BackgroundColor = StyleNano.NanoGold},
-                CustomMinimumSize = (2, 0)
+                MinSize = (2, 0)
             });
             _humanoidProfileEditor = new HumanoidProfileEditor(preferencesManager, prototypeManager, entityManager);
             _humanoidProfileEditor.OnProfileChanged += newProfile => { UpdateUI(); };
@@ -266,7 +247,7 @@ namespace Content.Client.UserInterface
                 {
                     Text = description,
                     ClipText = true,
-                    SizeFlagsHorizontal = SizeFlags.FillExpand
+                    HorizontalExpand = true
                 };
                 var deleteButton = new Button
                 {
@@ -281,7 +262,7 @@ namespace Content.Client.UserInterface
 
                 var internalHBox = new HBoxContainer
                 {
-                    SizeFlagsHorizontal = SizeFlags.FillExpand,
+                    HorizontalExpand = true,
                     SeparationOverride = 0,
                     Children =
                     {