From 3fa2e0c976d7c6b3fd420dba2238257dd5e329f1 Mon Sep 17 00:00:00 2001
From: moneyl <8206401+Moneyl@users.noreply.github.com>
Date: Tue, 14 May 2019 17:40:55 -0400
Subject: [PATCH 01/10] Removed chatbox dependence on tscn file

This turned out to be much simpler than how I was initially making it. The important thing to note is that without setting the margin and anchor values for the chatbox itself (not it's children) it won't show up on the screen.
---
 Content.Client/Chat/ChatBox.cs        |  29 +++--
 Resources/Scenes/ChatBox/ChatBox.tscn | 162 --------------------------
 2 files changed, 18 insertions(+), 173 deletions(-)
 delete mode 100644 Resources/Scenes/ChatBox/ChatBox.tscn

diff --git a/Content.Client/Chat/ChatBox.cs b/Content.Client/Chat/ChatBox.cs
index 8e756d59ad..88b778002c 100644
--- a/Content.Client/Chat/ChatBox.cs
+++ b/Content.Client/Chat/ChatBox.cs
@@ -11,8 +11,6 @@ namespace Content.Client.Chat
 {
     public class ChatBox : PanelContainer
     {
-        protected override ResourcePath ScenePath => new ResourcePath("/Scenes/ChatBox/ChatBox.tscn");
-
         public delegate void TextSubmitHandler(ChatBox chatBox, string text);
 
         private const int MaxLinePixelLength = 500;
@@ -43,19 +41,28 @@ namespace Content.Client.Chat
         {
             base.Initialize();
 
-            Input = GetChild<LineEdit>("VBoxContainer/Input");
+            MarginLeft = -475.0f;
+            MarginTop = 10.0f;
+            MarginRight = -10.0f;
+            MarginBottom = 185.0f;
+
+            AnchorLeft = 1.0f;
+            AnchorRight = 1.0f;
+
+            VBoxContainer VBox = new VBoxContainer("VBoxContainer");
+
+            contents = new OutputPanel();
+            contents.SizeFlagsVertical = SizeFlags.FillExpand;
+            VBox.AddChild(contents);
+
+            Input = new LineEdit("Input");
             Input.OnKeyDown += InputKeyDown;
             Input.OnTextEntered += Input_OnTextEntered;
-            GetChild<Control>("VBoxContainer/Contents").Dispose();
+            VBox.AddChild(Input);
 
-            contents = new OutputPanel
-            {
-                SizeFlagsVertical = SizeFlags.FillExpand,
-            };
-            GetChild("VBoxContainer").AddChild(contents);
-            contents.SetPositionInParent(0);
+            AddChild(VBox);
 
-            PanelOverride = new StyleBoxFlat {BackgroundColor = Color.Gray.WithAlpha(0.5f)};
+            PanelOverride = new StyleBoxFlat { BackgroundColor = Color.Gray.WithAlpha(0.5f) };
         }
 
         protected override void MouseDown(GUIMouseButtonEventArgs e)
diff --git a/Resources/Scenes/ChatBox/ChatBox.tscn b/Resources/Scenes/ChatBox/ChatBox.tscn
deleted file mode 100644
index 5c01489084..0000000000
--- a/Resources/Scenes/ChatBox/ChatBox.tscn
+++ /dev/null
@@ -1,162 +0,0 @@
-[gd_scene load_steps=5 format=2]
-
-[ext_resource path="res://Engine/Fonts/CALIBRI.TTF" type="DynamicFontData" id=1]
-
-[sub_resource type="StyleBoxFlat" id=3]
-
-content_margin_left = -1.0
-content_margin_right = -1.0
-content_margin_top = -1.0
-content_margin_bottom = -1.0
-bg_color = Color( 0.501961, 0.501961, 0.501961, 0.501961 )
-draw_center = true
-border_width_left = 1
-border_width_top = 1
-border_width_right = 1
-border_width_bottom = 1
-border_color = Color( 0, 0, 0, 0.501961 )
-border_blend = false
-corner_radius_top_left = 0
-corner_radius_top_right = 0
-corner_radius_bottom_right = 0
-corner_radius_bottom_left = 0
-corner_detail = 8
-expand_margin_left = 1.0
-expand_margin_right = 1.0
-expand_margin_top = 1.0
-expand_margin_bottom = 1.0
-shadow_color = Color( 0, 0, 0, 0.6 )
-shadow_size = 0
-anti_aliasing = true
-anti_aliasing_size = 1
-_sections_unfolded = [ "Anti Aliasing", "Border Width", "Corner Radius", "Expand Margin", "Shadow" ]
-
-[sub_resource type="DynamicFont" id=1]
-
-size = 16
-use_mipmaps = false
-use_filter = false
-font_data = ExtResource( 1 )
-_sections_unfolded = [ "Extra Spacing", "Font/fallback", "Settings" ]
-
-[sub_resource type="StyleBoxFlat" id=2]
-
-content_margin_left = 2.0
-content_margin_right = -1.0
-content_margin_top = -1.0
-content_margin_bottom = -1.0
-bg_color = Color( 0.0234375, 0.0234375, 0.0234375, 0.501961 )
-draw_center = true
-border_width_left = 0
-border_width_top = 0
-border_width_right = 0
-border_width_bottom = 0
-border_color = Color( 0.8, 0.8, 0.8, 1 )
-border_blend = false
-corner_radius_top_left = 1
-corner_radius_top_right = 1
-corner_radius_bottom_right = 0
-corner_radius_bottom_left = 0
-corner_detail = 8
-expand_margin_left = 0.0
-expand_margin_right = 0.0
-expand_margin_top = 0.0
-expand_margin_bottom = 0.0
-shadow_color = Color( 0, 0, 0, 0.6 )
-shadow_size = 0
-anti_aliasing = true
-anti_aliasing_size = 1
-_sections_unfolded = [ "Content Margin", "Corner Radius", "Expand Margin" ]
-
-[node name="ChatBox" type="PanelContainer" index="0"]
-
-anchor_left = 1.0
-anchor_top = 0.0
-anchor_right = 1.0
-anchor_bottom = 0.0
-margin_left = -475.0
-margin_top = 10.0
-margin_right = -10.0
-margin_bottom = 185.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-custom_styles/panel = SubResource( 3 )
-_sections_unfolded = [ "Anchor", "Grow Direction", "Margin", "Rect", "custom_styles" ]
-
-[node name="VBoxContainer" type="VBoxContainer" parent="." index="0"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_left = 1.0
-margin_top = 1.0
-margin_right = 464.0
-margin_bottom = 174.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 1
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-alignment = 0
-
-[node name="Contents" type="RichTextLabel" parent="VBoxContainer" index="0"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_right = 463.0
-margin_bottom = 153.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = true
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 3
-custom_fonts/normal_font = SubResource( 1 )
-bbcode_enabled = false
-bbcode_text = ""
-visible_characters = -1
-percent_visible = 1.0
-meta_underlined = true
-tab_size = 4
-text = ""
-scroll_active = true
-scroll_following = false
-selection_enabled = false
-override_selected_font_color = false
-_sections_unfolded = [ "BBCode", "Size Flags", "custom_fonts" ]
-
-[node name="Input" type="LineEdit" parent="VBoxContainer" index="1"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_top = 157.0
-margin_right = 463.0
-margin_bottom = 173.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 1
-size_flags_horizontal = 1
-size_flags_vertical = 1
-custom_styles/normal = SubResource( 2 )
-custom_fonts/font = SubResource( 1 )
-focus_mode = 2
-context_menu_enabled = true
-placeholder_alpha = 0.6
-caret_blink = true
-caret_blink_speed = 0.5
-caret_position = 0
-_sections_unfolded = [ "Margin", "custom_colors", "custom_constants", "custom_fonts", "custom_styles" ]
-
-

From 2917a87ce7de0ef809a43dbf79a7f4b3f7c0c818 Mon Sep 17 00:00:00 2001
From: moneyl <8206401+Moneyl@users.noreply.github.com>
Date: Tue, 14 May 2019 23:23:00 -0400
Subject: [PATCH 02/10] Removed APC gui dependence on tscn file

---
 .../Components/Power/ApcBoundUserInterface.cs |  47 +++-
 Resources/Scenes/Power/Apc.tscn               | 230 ------------------
 2 files changed, 42 insertions(+), 235 deletions(-)
 delete mode 100644 Resources/Scenes/Power/Apc.tscn

diff --git a/Content.Client/GameObjects/Components/Power/ApcBoundUserInterface.cs b/Content.Client/GameObjects/Components/Power/ApcBoundUserInterface.cs
index be9512bbdc..7159d330a3 100644
--- a/Content.Client/GameObjects/Components/Power/ApcBoundUserInterface.cs
+++ b/Content.Client/GameObjects/Components/Power/ApcBoundUserInterface.cs
@@ -1,7 +1,9 @@
 using System;
 using Content.Shared.GameObjects.Components.Power;
+using OpenTK.Graphics.OpenGL4;
 using Robust.Client.GameObjects.Components.UserInterface;
 using Robust.Client.Interfaces.Graphics;
+using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.GameObjects.Components.UserInterface;
@@ -21,12 +23,47 @@ namespace Content.Client.GameObjects.Components.Power
         {
             base.Open();
 
-            _window = new ApcWindow(IoCManager.Resolve<IDisplayManager>());
+            _window = new SS14Window(IoCManager.Resolve<IDisplayManager>())
+            {
+                MarginRight = 426.0f, MarginBottom = 270.0f
+            };
             _window.OnClose += Close;
-            _breakerButton = _window.Contents.GetChild<BaseButton>("Rows/Breaker/Breaker");
+
+            var rows = new VBoxContainer("Rows");
+
+            var statusHeader = new Label("StatusHeader") {Text = "Power Status: "};
+            rows.AddChild(statusHeader);
+
+            var breaker = new HBoxContainer("Breaker");
+            var breakerLabel = new Label("Label") {Text = "Main Breaker: "};
+            _breakerButton = new CheckButton();
             _breakerButton.OnPressed += _ => SendMessage(new ApcToggleMainBreakerMessage());
-            _externalPowerStateLabel = _window.Contents.GetChild<Label>("Rows/ExternalStatus/Status");
-            _chargeBar = _window.Contents.GetChild<ProgressBar>("Rows/Charge/Charge");
+            breaker.AddChild(breakerLabel);
+            breaker.AddChild(_breakerButton);
+            rows.AddChild(breaker);
+
+            var externalStatus = new HBoxContainer("ExternalStatus");
+            var externalStatusLabel = new Label("Label") {Text = "External Power: "};
+            _externalPowerStateLabel = new Label("Status") {Text = "Good"};
+            externalStatus.AddChild(externalStatusLabel);
+            externalStatus.AddChild(_externalPowerStateLabel);
+            rows.AddChild(externalStatus);
+
+            var charge = new HBoxContainer("Charge");
+            var chargeLabel = new Label("Label") {Text = "Charge:"};
+            _chargeBar = new ProgressBar("Charge")
+            {
+                SizeFlagsHorizontal = Control.SizeFlags.FillExpand,
+                MinValue = 0.0f,
+                MaxValue = 1.0f,
+                Page = 0.0f,
+                Value = 0.5f
+            };
+            charge.AddChild(chargeLabel);
+            charge.AddChild(_chargeBar);
+            rows.AddChild(charge);
+
+            _window.Contents.AddChild(rows);
             _window.AddToScreen();
         }
 
@@ -71,7 +108,7 @@ namespace Content.Client.GameObjects.Components.Power
 
         private class ApcWindow : SS14Window
         {
-            protected override ResourcePath ScenePath => new ResourcePath("/Scenes/Power/Apc.tscn");
+            //protected override ResourcePath ScenePath => new ResourcePath("/Scenes/Power/Apc.tscn");
 
             public ApcWindow(IDisplayManager displayMan) : base(displayMan) { }
         }
diff --git a/Resources/Scenes/Power/Apc.tscn b/Resources/Scenes/Power/Apc.tscn
deleted file mode 100644
index d6f12561d6..0000000000
--- a/Resources/Scenes/Power/Apc.tscn
+++ /dev/null
@@ -1,230 +0,0 @@
-[gd_scene load_steps=2 format=2]
-
-[ext_resource path="res://Engine/Scenes/SS14Window/SS14Window.tscn" type="PackedScene" id=1]
-
-[node name="SS14Window" index="0" instance=ExtResource( 1 )]
-margin_right = 426.0
-margin_bottom = 270.0
-rect_clip_content = false
-
-[node name="Contents" parent="." index="0"]
-rect_clip_content = false
-
-[node name="Rows" type="VBoxContainer" parent="Contents" index="0"]
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 1.0
-anchor_bottom = 1.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 2
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-alignment = 0
-
-[node name="StatusHeader" type="Label" parent="Contents/Rows" index="0"]
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_right = 306.0
-margin_bottom = 14.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 2
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 4
-text = "Power Status:"
-percent_visible = 1.0
-lines_skipped = 0
-max_lines_visible = -1
-
-[node name="Breaker" type="HBoxContainer" parent="Contents/Rows" index="1"]
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_top = 18.0
-margin_right = 306.0
-margin_bottom = 58.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 1
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-alignment = 0
-
-[node name="Label" type="Label" parent="Contents/Rows/Breaker" index="0"]
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_top = 13.0
-margin_right = 100.0
-margin_bottom = 27.0
-rect_min_size = Vector2( 100, 0 )
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 2
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 4
-text = "Main Breaker:"
-percent_visible = 1.0
-lines_skipped = 0
-max_lines_visible = -1
-_sections_unfolded = [ "Rect" ]
-
-[node name="Breaker" type="CheckButton" parent="Contents/Rows/Breaker" index="1"]
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_left = 104.0
-margin_right = 180.0
-margin_bottom = 40.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = true
-pressed = true
-enabled_focus_mode = 2
-shortcut = null
-group = null
-flat = false
-align = 0
-
-[node name="ExternalStatus" type="HBoxContainer" parent="Contents/Rows" index="2"]
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_top = 62.0
-margin_right = 306.0
-margin_bottom = 76.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 1
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-alignment = 0
-
-[node name="Label" type="Label" parent="Contents/Rows/ExternalStatus" index="0"]
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_right = 100.0
-margin_bottom = 14.0
-rect_min_size = Vector2( 100, 0 )
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 2
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 4
-text = "External Power:"
-percent_visible = 1.0
-lines_skipped = 0
-max_lines_visible = -1
-_sections_unfolded = [ "Rect" ]
-
-[node name="Status" type="Label" parent="Contents/Rows/ExternalStatus" index="1"]
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_left = 104.0
-margin_right = 138.0
-margin_bottom = 14.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 2
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 4
-text = "Good"
-percent_visible = 1.0
-lines_skipped = 0
-max_lines_visible = -1
-
-[node name="Charge" type="HBoxContainer" parent="Contents/Rows" index="3"]
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_top = 80.0
-margin_right = 306.0
-margin_bottom = 94.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 1
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-alignment = 0
-
-[node name="Label" type="Label" parent="Contents/Rows/Charge" index="0"]
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_right = 100.0
-margin_bottom = 14.0
-rect_min_size = Vector2( 100, 0 )
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 2
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 4
-text = "Charge:"
-percent_visible = 1.0
-lines_skipped = 0
-max_lines_visible = -1
-_sections_unfolded = [ "Rect" ]
-
-[node name="Charge" type="ProgressBar" parent="Contents/Rows/Charge" index="1"]
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_left = 104.0
-margin_right = 306.0
-margin_bottom = 14.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 3
-size_flags_vertical = 0
-min_value = 0.0
-max_value = 1.0
-step = 1.0
-page = 0.0
-value = 0.5
-exp_edit = false
-rounded = false
-allow_greater = false
-allow_lesser = false
-percent_visible = true
-_sections_unfolded = [ "Percent" ]
-
-[node name="Header" parent="." index="1"]
-editor/display_folded = true
-rect_clip_content = false
-
-[node name="Header Text" parent="Header" index="0"]
-rect_clip_content = false
-
-[node name="CloseButton" parent="Header" index="1"]
-rect_clip_content = false
-

From bec187d997f52eab02c15592e4d280d93c38074d Mon Sep 17 00:00:00 2001
From: moneyl <8206401+Moneyl@users.noreply.github.com>
Date: Tue, 14 May 2019 23:52:00 -0400
Subject: [PATCH 03/10] Slight chatbox changes to fit existing code style and
 naming

---
 Content.Client/Chat/ChatBox.cs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Content.Client/Chat/ChatBox.cs b/Content.Client/Chat/ChatBox.cs
index 88b778002c..a081ed59eb 100644
--- a/Content.Client/Chat/ChatBox.cs
+++ b/Content.Client/Chat/ChatBox.cs
@@ -49,18 +49,17 @@ namespace Content.Client.Chat
             AnchorLeft = 1.0f;
             AnchorRight = 1.0f;
 
-            VBoxContainer VBox = new VBoxContainer("VBoxContainer");
+            var vBox = new VBoxContainer("VBoxContainer");
 
-            contents = new OutputPanel();
-            contents.SizeFlagsVertical = SizeFlags.FillExpand;
-            VBox.AddChild(contents);
+            contents = new OutputPanel {SizeFlagsVertical = SizeFlags.FillExpand};
+            vBox.AddChild(contents);
 
             Input = new LineEdit("Input");
             Input.OnKeyDown += InputKeyDown;
             Input.OnTextEntered += Input_OnTextEntered;
-            VBox.AddChild(Input);
+            vBox.AddChild(Input);
 
-            AddChild(VBox);
+            AddChild(vBox);
 
             PanelOverride = new StyleBoxFlat { BackgroundColor = Color.Gray.WithAlpha(0.5f) };
         }

From 2b0ca2dd8bca85e9792b1d1ec70ff286c294985e Mon Sep 17 00:00:00 2001
From: moneyl <8206401+Moneyl@users.noreply.github.com>
Date: Wed, 15 May 2019 12:31:54 -0400
Subject: [PATCH 04/10] Moved APC controls creation into the ApcWindow
 constructor

---
 .../Components/Power/ApcBoundUserInterface.cs | 82 ++++++++++---------
 1 file changed, 43 insertions(+), 39 deletions(-)

diff --git a/Content.Client/GameObjects/Components/Power/ApcBoundUserInterface.cs b/Content.Client/GameObjects/Components/Power/ApcBoundUserInterface.cs
index 7159d330a3..335963310c 100644
--- a/Content.Client/GameObjects/Components/Power/ApcBoundUserInterface.cs
+++ b/Content.Client/GameObjects/Components/Power/ApcBoundUserInterface.cs
@@ -23,48 +23,18 @@ namespace Content.Client.GameObjects.Components.Power
         {
             base.Open();
 
-            _window = new SS14Window(IoCManager.Resolve<IDisplayManager>())
+            _window = new ApcWindow(IoCManager.Resolve<IDisplayManager>())
             {
                 MarginRight = 426.0f, MarginBottom = 270.0f
             };
             _window.OnClose += Close;
-
-            var rows = new VBoxContainer("Rows");
-
-            var statusHeader = new Label("StatusHeader") {Text = "Power Status: "};
-            rows.AddChild(statusHeader);
-
-            var breaker = new HBoxContainer("Breaker");
-            var breakerLabel = new Label("Label") {Text = "Main Breaker: "};
-            _breakerButton = new CheckButton();
-            _breakerButton.OnPressed += _ => SendMessage(new ApcToggleMainBreakerMessage());
-            breaker.AddChild(breakerLabel);
-            breaker.AddChild(_breakerButton);
-            rows.AddChild(breaker);
-
-            var externalStatus = new HBoxContainer("ExternalStatus");
-            var externalStatusLabel = new Label("Label") {Text = "External Power: "};
-            _externalPowerStateLabel = new Label("Status") {Text = "Good"};
-            externalStatus.AddChild(externalStatusLabel);
-            externalStatus.AddChild(_externalPowerStateLabel);
-            rows.AddChild(externalStatus);
-
-            var charge = new HBoxContainer("Charge");
-            var chargeLabel = new Label("Label") {Text = "Charge:"};
-            _chargeBar = new ProgressBar("Charge")
-            {
-                SizeFlagsHorizontal = Control.SizeFlags.FillExpand,
-                MinValue = 0.0f,
-                MaxValue = 1.0f,
-                Page = 0.0f,
-                Value = 0.5f
-            };
-            charge.AddChild(chargeLabel);
-            charge.AddChild(_chargeBar);
-            rows.AddChild(charge);
-
-            _window.Contents.AddChild(rows);
             _window.AddToScreen();
+
+            _breakerButton = _window.Contents.GetChild<CheckButton>("Rows/Breaker/Breaker");
+            _breakerButton.OnPressed += _ => SendMessage(new ApcToggleMainBreakerMessage());
+
+            _externalPowerStateLabel = _window.Contents.GetChild<Label>("Rows/ExternalStatus/Status");
+            _chargeBar = _window.Contents.GetChild<ProgressBar>("Rows/Charge/Charge");
         }
 
         public ApcBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
@@ -108,9 +78,43 @@ namespace Content.Client.GameObjects.Components.Power
 
         private class ApcWindow : SS14Window
         {
-            //protected override ResourcePath ScenePath => new ResourcePath("/Scenes/Power/Apc.tscn");
+            public ApcWindow(IDisplayManager displayMan) : base(displayMan)
+            {
+                var rows = new VBoxContainer("Rows");
 
-            public ApcWindow(IDisplayManager displayMan) : base(displayMan) { }
+                var statusHeader = new Label("StatusHeader") { Text = "Power Status: " };
+                rows.AddChild(statusHeader);
+
+                var breaker = new HBoxContainer("Breaker");
+                var breakerLabel = new Label("Label") { Text = "Main Breaker: " };
+                var breakerButton = new CheckButton {Name = "Breaker"};
+                breaker.AddChild(breakerLabel);
+                breaker.AddChild(breakerButton);
+                rows.AddChild(breaker);
+
+                var externalStatus = new HBoxContainer("ExternalStatus");
+                var externalStatusLabel = new Label("Label") { Text = "External Power: " };
+                var externalPowerStateLabel = new Label("Status") { Text = "Good" };
+                externalStatus.AddChild(externalStatusLabel);
+                externalStatus.AddChild(externalPowerStateLabel);
+                rows.AddChild(externalStatus);
+
+                var charge = new HBoxContainer("Charge");
+                var chargeLabel = new Label("Label") { Text = "Charge:" };
+                var chargeBar = new ProgressBar("Charge")
+                {
+                    SizeFlagsHorizontal = Control.SizeFlags.FillExpand,
+                    MinValue = 0.0f,
+                    MaxValue = 1.0f,
+                    Page = 0.0f,
+                    Value = 0.5f
+                };
+                charge.AddChild(chargeLabel);
+                charge.AddChild(chargeBar);
+                rows.AddChild(charge);
+
+                Contents.AddChild(rows);
+            }
         }
     }
 }

From ddcdeca4eabf4adef0e5bdb19a762215913d0ae6 Mon Sep 17 00:00:00 2001
From: moneyl <8206401+Moneyl@users.noreply.github.com>
Date: Wed, 15 May 2019 17:37:44 -0400
Subject: [PATCH 05/10] Removed construction menu dependence on tscn file

One minor issue remains with this that I can't resolve. The construction window starts off much larger than the tscn dependent version on master. It can be shrunk manually and it'll look the same, but it'd be nice to keep it as it was. Tried manually changing the window size and changing the size flags but couldn't get it to work as I wanted.
---
 .../Construction/ConstructionButton.cs        |  10 +-
 .../Construction/ConstructionMenu.cs          |  73 ++++-
 .../Construction/ConstructionButton.tscn      |  26 --
 .../Scenes/Construction/ConstructionMenu.tscn | 270 ------------------
 4 files changed, 67 insertions(+), 312 deletions(-)
 delete mode 100644 Resources/Scenes/Construction/ConstructionButton.tscn
 delete mode 100644 Resources/Scenes/Construction/ConstructionMenu.tscn

diff --git a/Content.Client/Construction/ConstructionButton.cs b/Content.Client/Construction/ConstructionButton.cs
index 14a8464f14..5bab5217ef 100644
--- a/Content.Client/Construction/ConstructionButton.cs
+++ b/Content.Client/Construction/ConstructionButton.cs
@@ -8,7 +8,6 @@ namespace Content.Client.Construction
     public class ConstructionButton : Button
     {
         private readonly IDisplayManager _displayManager;
-        protected override ResourcePath ScenePath => new ResourcePath("/Scenes/Construction/ConstructionButton.tscn");
 
         public ConstructorComponent Owner
         {
@@ -27,6 +26,15 @@ namespace Content.Client.Construction
         {
             base.Initialize();
 
+            AnchorLeft = 1.0f;
+            AnchorTop = 1.0f;
+            AnchorRight = 1.0f;
+            AnchorBottom = 1.0f;
+            MarginLeft = -110.0f;
+            MarginTop = -70.0f;
+            MarginRight = -50.0f;
+            MarginBottom = -50.0f;
+            Text = "Crafting";
             OnPressed += IWasPressed;
         }
 
diff --git a/Content.Client/Construction/ConstructionMenu.cs b/Content.Client/Construction/ConstructionMenu.cs
index 9ac87ace82..2551cf4a3f 100644
--- a/Content.Client/Construction/ConstructionMenu.cs
+++ b/Content.Client/Construction/ConstructionMenu.cs
@@ -27,7 +27,6 @@ namespace Content.Client.Construction
 {
     public class ConstructionMenu : SS14Window
     {
-        protected override ResourcePath ScenePath => new ResourcePath("/Scenes/Construction/ConstructionMenu.tscn");
 
 #pragma warning disable CS0649
         [Dependency]
@@ -61,22 +60,66 @@ namespace Content.Client.Construction
             HideOnClose = true;
             Title = "Construction";
             Visible = false;
-            var split = Contents.GetChild("HSplitContainer");
-            var rightSide = split.GetChild("Guide");
-            var info = rightSide.GetChild("Info");
-            InfoIcon = info.GetChild<TextureRect>("TextureRect");
-            InfoLabel = info.GetChild<Label>("Label");
-            StepList = rightSide.GetChild<ItemList>("StepsList");
-            var buttons = rightSide.GetChild("Buttons");
-            BuildButton = buttons.GetChild<Button>("BuildButton");
-            BuildButton.OnPressed += OnBuildPressed;
-            EraseButton = buttons.GetChild<Button>("EraseButton");
-            EraseButton.OnToggled += OnEraseToggled;
 
-            var leftSide = split.GetChild("Recipes");
-            SearchBar = leftSide.GetChild<LineEdit>("Search");
+            var hSplitContainer = new HSplitContainer();
+
+            // Left side
+            var recipes = new VBoxContainer("Recipes") {CustomMinimumSize = new Vector2(150.0f, 0.0f)};
+            SearchBar = new LineEdit("Search") {PlaceHolder = "Search"};
+            RecipeList = new Tree("Tree") {SizeFlagsVertical = SizeFlags.FillExpand, HideRoot = true};
+            recipes.AddChild(SearchBar);
+            recipes.AddChild(RecipeList);
+            hSplitContainer.AddChild(recipes);
+
+            // Right side
+            var guide = new VBoxContainer("Guide");
+            var info = new HBoxContainer("Info");
+            InfoIcon = new TextureRect("TextureRect");
+            InfoLabel = new Label("Label")
+            {
+                SizeFlagsHorizontal = SizeFlags.FillExpand, SizeFlagsVertical = SizeFlags.ShrinkCenter
+            };
+            info.AddChild(InfoIcon);
+            info.AddChild(InfoLabel);
+            guide.AddChild(info);
+
+            var stepsLabel = new Label("Label")
+            {
+                SizeFlagsHorizontal = SizeFlags.ShrinkCenter,
+                SizeFlagsVertical = SizeFlags.ShrinkCenter,
+                Text = "Steps"
+            };
+            guide.AddChild(stepsLabel);
+
+            StepList = new ItemList("StepsList")
+            {
+                SizeFlagsVertical = SizeFlags.FillExpand, SelectMode = ItemList.ItemListSelectMode.None
+            };
+            guide.AddChild(StepList);
+
+            var buttonsContainer = new HBoxContainer("Buttons");
+            BuildButton = new Button("BuildButton")
+            {
+                SizeFlagsHorizontal = SizeFlags.FillExpand,
+                TextAlign = Button.AlignMode.Center,
+                Text = "Build!",
+                Disabled = true,
+                ToggleMode = false
+            };
+            EraseButton = new Button("EraseButton")
+            {
+                TextAlign = Button.AlignMode.Center, Text = "Clear Ghosts", ToggleMode = true
+            };
+            buttonsContainer.AddChild(BuildButton);
+            buttonsContainer.AddChild(EraseButton);
+            guide.AddChild(buttonsContainer);
+
+            hSplitContainer.AddChild(guide);
+            Contents.AddChild(hSplitContainer);
+
+            BuildButton.OnPressed += OnBuildPressed;
+            EraseButton.OnToggled += OnEraseToggled;
             SearchBar.OnTextChanged += OnTextEntered;
-            RecipeList = leftSide.GetChild<Tree>("Tree");
             RecipeList.OnItemSelected += OnItemSelected;
 
             PopulatePrototypeList();
diff --git a/Resources/Scenes/Construction/ConstructionButton.tscn b/Resources/Scenes/Construction/ConstructionButton.tscn
deleted file mode 100644
index 48f0fa22e9..0000000000
--- a/Resources/Scenes/Construction/ConstructionButton.tscn
+++ /dev/null
@@ -1,26 +0,0 @@
-[gd_scene format=2]
-
-[node name="Control" type="Button"]
-anchor_left = 1.0
-anchor_top = 1.0
-anchor_right = 1.0
-anchor_bottom = 1.0
-margin_left = -110.0
-margin_top = -70.0
-margin_right = -50.0
-margin_bottom = -50.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
-text = "Crafting"
-flat = false
-align = 1
-
diff --git a/Resources/Scenes/Construction/ConstructionMenu.tscn b/Resources/Scenes/Construction/ConstructionMenu.tscn
deleted file mode 100644
index 6cb9310c6b..0000000000
--- a/Resources/Scenes/Construction/ConstructionMenu.tscn
+++ /dev/null
@@ -1,270 +0,0 @@
-[gd_scene load_steps=2 format=2]
-
-[ext_resource path="res://Engine/Scenes/SS14Window/SS14Window.tscn" type="PackedScene" id=1]
-
-[node name="SS14Window" index="0" instance=ExtResource( 1 )]
-margin_left = 99.0
-margin_right = 583.0
-margin_bottom = 357.0
-
-[node name="HSplitContainer" type="HSplitContainer" parent="Contents" index="0"]
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 1.0
-anchor_bottom = 1.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 1
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-split_offset = 15
-collapsed = false
-dragger_visibility = 0
-
-[node name="Recipes" type="VBoxContainer" parent="Contents/HSplitContainer" index="0"]
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_right = 163.0
-margin_bottom = 269.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 2
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-size_flags_stretch_ratio = 0.5
-rect_min_size = Vector2( 150, 0 )
-alignment = 0
-_sections_unfolded = [ "Grow Direction", "Size Flags" ]
-
-[node name="Search" type="LineEdit" parent="Contents/HSplitContainer/Recipes" index="0"]
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_right = 163.0
-margin_bottom = 24.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 1
-size_flags_horizontal = 1
-size_flags_vertical = 1
-secret_character = "*"
-focus_mode = 2
-context_menu_enabled = true
-placeholder_text = "Search"
-placeholder_alpha = 0.6
-caret_blink = false
-caret_blink_speed = 0.65
-caret_position = 0
-
-[node name="Tree" type="Tree" parent="Contents/HSplitContainer/Recipes" index="1"]
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_top = 28.0
-margin_right = 163.0
-margin_bottom = 269.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = true
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 3
-columns = 1
-allow_reselect = false
-allow_rmb_select = false
-hide_folding = false
-hide_root = true
-drop_mode_flags = 0
-select_mode = 0
-_sections_unfolded = [ "Mouse" ]
-
-[node name="Guide" type="VBoxContainer" parent="Contents/HSplitContainer" index="1"]
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_left = 175.0
-margin_right = 464.0
-margin_bottom = 269.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 2
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 3
-size_flags_vertical = 3
-alignment = 0
-
-[node name="Info" type="HBoxContainer" parent="Contents/HSplitContainer/Guide" index="0"]
-editor/display_folded = true
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_right = 289.0
-margin_bottom = 14.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 2
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-alignment = 0
-
-[node name="TextureRect" type="TextureRect" parent="Contents/HSplitContainer/Guide/Info" index="0"]
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_bottom = 14.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 2
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-stretch_mode = 0
-
-[node name="Label" type="Label" parent="Contents/HSplitContainer/Guide/Info" index="1"]
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_left = 4.0
-margin_right = 289.0
-margin_bottom = 14.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 2
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 3
-size_flags_vertical = 4
-autowrap = true
-percent_visible = 1.0
-lines_skipped = 0
-max_lines_visible = -1
-_sections_unfolded = [ "Size Flags" ]
-
-[node name="Label" type="Label" parent="Contents/HSplitContainer/Guide" index="1"]
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_left = 127.0
-margin_top = 18.0
-margin_right = 162.0
-margin_bottom = 32.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 2
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 4
-size_flags_vertical = 4
-custom_colors/font_color = Color( 0.505882, 0.505882, 0.505882, 1 )
-text = "Steps"
-percent_visible = 1.0
-lines_skipped = 0
-max_lines_visible = -1
-
-[node name="StepsList" type="ItemList" parent="Contents/HSplitContainer/Guide" index="2"]
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_top = 36.0
-margin_right = 289.0
-margin_bottom = 245.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = true
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 3
-items = [  ]
-select_mode = 0
-allow_reselect = false
-icon_mode = 1
-fixed_icon_size = Vector2( 0, 0 )
-_sections_unfolded = [ "Icon", "Size Flags" ]
-
-[node name="Buttons" type="HBoxContainer" parent="Contents/HSplitContainer/Guide" index="3"]
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_top = 249.0
-margin_right = 289.0
-margin_bottom = 269.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 1
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-alignment = 0
-
-[node name="BuildButton" type="Button" parent="Contents/HSplitContainer/Guide/Buttons" index="0"]
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_right = 192.0
-margin_bottom = 20.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 3
-size_flags_vertical = 1
-disabled = true
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
-text = "Build!"
-flat = false
-align = 1
-_sections_unfolded = [ "Size Flags" ]
-
-[node name="EraseButton" type="Button" parent="Contents/HSplitContainer/Guide/Buttons" index="1"]
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_left = 196.0
-margin_right = 289.0
-margin_bottom = 20.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = true
-enabled_focus_mode = 2
-shortcut = null
-group = null
-text = "Clear Ghosts"
-flat = false
-align = 1
-
-[node name="Header" parent="." index="1"]
-rect_clip_content = false
-
-[node name="Header Text" parent="Header" index="0"]
-rect_clip_content = false
-
-[node name="CloseButton" parent="Header" index="1"]
-rect_clip_content = false
-

From e40b775f7c3c36eef1c72dd0355062ec714733a8 Mon Sep 17 00:00:00 2001
From: moneyl <8206401+Moneyl@users.noreply.github.com>
Date: Thu, 16 May 2019 13:22:55 -0400
Subject: [PATCH 06/10] Added properties for several ui controls to ApcWindow

By PJBs suggestion. Cleaner to do this instead of repeatedly calling GetChild. Also changed ApcBoundUserInterface._window from an SS14Window to an ApcWindow to avoid extra type casting.
---
 .../Components/Power/ApcBoundUserInterface.cs | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/Content.Client/GameObjects/Components/Power/ApcBoundUserInterface.cs b/Content.Client/GameObjects/Components/Power/ApcBoundUserInterface.cs
index 335963310c..06f74127a2 100644
--- a/Content.Client/GameObjects/Components/Power/ApcBoundUserInterface.cs
+++ b/Content.Client/GameObjects/Components/Power/ApcBoundUserInterface.cs
@@ -1,5 +1,6 @@
 using System;
 using Content.Shared.GameObjects.Components.Power;
+using NJsonSchema.Validation;
 using OpenTK.Graphics.OpenGL4;
 using Robust.Client.GameObjects.Components.UserInterface;
 using Robust.Client.Interfaces.Graphics;
@@ -14,7 +15,7 @@ namespace Content.Client.GameObjects.Components.Power
 {
     public class ApcBoundUserInterface : BoundUserInterface
     {
-        private SS14Window _window;
+        private ApcWindow _window;
         private BaseButton _breakerButton;
         private Label _externalPowerStateLabel;
         private ProgressBar _chargeBar;
@@ -30,11 +31,11 @@ namespace Content.Client.GameObjects.Components.Power
             _window.OnClose += Close;
             _window.AddToScreen();
 
-            _breakerButton = _window.Contents.GetChild<CheckButton>("Rows/Breaker/Breaker");
+            _breakerButton = _window.BreakerButton;
             _breakerButton.OnPressed += _ => SendMessage(new ApcToggleMainBreakerMessage());
 
-            _externalPowerStateLabel = _window.Contents.GetChild<Label>("Rows/ExternalStatus/Status");
-            _chargeBar = _window.Contents.GetChild<ProgressBar>("Rows/Charge/Charge");
+            _externalPowerStateLabel = _window.ExternalPowerStateLabel;
+            _chargeBar = _window.ChargeBar;
         }
 
         public ApcBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
@@ -78,6 +79,10 @@ namespace Content.Client.GameObjects.Components.Power
 
         private class ApcWindow : SS14Window
         {
+            public Button BreakerButton { get; set; }
+            public Label ExternalPowerStateLabel { get; set; }
+            public ProgressBar ChargeBar { get; set; }
+
             public ApcWindow(IDisplayManager displayMan) : base(displayMan)
             {
                 var rows = new VBoxContainer("Rows");
@@ -87,21 +92,21 @@ namespace Content.Client.GameObjects.Components.Power
 
                 var breaker = new HBoxContainer("Breaker");
                 var breakerLabel = new Label("Label") { Text = "Main Breaker: " };
-                var breakerButton = new CheckButton {Name = "Breaker"};
+                BreakerButton = new CheckButton {Name = "Breaker"};
                 breaker.AddChild(breakerLabel);
-                breaker.AddChild(breakerButton);
+                breaker.AddChild(BreakerButton);
                 rows.AddChild(breaker);
 
                 var externalStatus = new HBoxContainer("ExternalStatus");
                 var externalStatusLabel = new Label("Label") { Text = "External Power: " };
-                var externalPowerStateLabel = new Label("Status") { Text = "Good" };
+                ExternalPowerStateLabel = new Label("Status") { Text = "Good" };
                 externalStatus.AddChild(externalStatusLabel);
-                externalStatus.AddChild(externalPowerStateLabel);
+                externalStatus.AddChild(ExternalPowerStateLabel);
                 rows.AddChild(externalStatus);
 
                 var charge = new HBoxContainer("Charge");
                 var chargeLabel = new Label("Label") { Text = "Charge:" };
-                var chargeBar = new ProgressBar("Charge")
+                ChargeBar = new ProgressBar("Charge")
                 {
                     SizeFlagsHorizontal = Control.SizeFlags.FillExpand,
                     MinValue = 0.0f,
@@ -110,7 +115,7 @@ namespace Content.Client.GameObjects.Components.Power
                     Value = 0.5f
                 };
                 charge.AddChild(chargeLabel);
-                charge.AddChild(chargeBar);
+                charge.AddChild(ChargeBar);
                 rows.AddChild(charge);
 
                 Contents.AddChild(rows);

From 4bb02d64fb6509ecc5708ac140d0bd4c19e6cf6a Mon Sep 17 00:00:00 2001
From: moneyl <8206401+Moneyl@users.noreply.github.com>
Date: Fri, 17 May 2019 00:07:24 -0400
Subject: [PATCH 07/10] Remove storage menu dependence on tscn file

---
 .../Storage/ClientStorageComponent.cs         |  95 ++++++--
 Resources/Scenes/Storage/Storage.tscn         | 207 ------------------
 Resources/Scenes/Storage/StorageEntity.tscn   | 131 -----------
 3 files changed, 80 insertions(+), 353 deletions(-)
 delete mode 100644 Resources/Scenes/Storage/Storage.tscn
 delete mode 100644 Resources/Scenes/Storage/StorageEntity.tscn

diff --git a/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs b/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs
index daf6efcaf2..03486aa4c2 100644
--- a/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs
+++ b/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs
@@ -11,6 +11,7 @@ using Robust.Shared.Utility;
 using System;
 using System.Collections.Generic;
 using Robust.Client.Interfaces.Graphics;
+using Robust.Shared.Maths;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
 
@@ -31,7 +32,7 @@ namespace Content.Client.GameObjects.Components.Storage
             base.OnAdd();
 
             Window = new StorageWindow(IoCManager.Resolve<IDisplayManager>())
-            { StorageEntity = this };
+            { StorageEntity = this, Size = new Vector2(180.0f, 320.0f)};
         }
 
         public override void OnRemove()
@@ -108,20 +109,39 @@ namespace Content.Client.GameObjects.Components.Storage
             private Label Information;
             public ClientStorageComponent StorageEntity;
 
-            protected override ResourcePath ScenePath => new ResourcePath("/Scenes/Storage/Storage.tscn");
-
             public StorageWindow(IDisplayManager displayMan) : base(displayMan) { }
 
             protected override void Initialize()
             {
                 base.Initialize();
 
+                Title = "Storage Item";
                 HideOnClose = true;
+                Visible = false;
+                RectClipContent = true;
 
-                // Get all the controls.
-                VSplitContainer = Contents.GetChild("VSplitContainer");
-                EntityList = VSplitContainer.GetChild("ListScrollContainer").GetChild<VBoxContainer>("EntityList");
-                Information = VSplitContainer.GetChild<Label>("Information");
+                VSplitContainer = new VBoxContainer("VSplitContainer");
+                Information = new Label("Information")
+                {
+                    Text = "Items: 0 Volume: 0/0 Stuff",
+                    SizeFlagsVertical = SizeFlags.ShrinkCenter
+                };
+                VSplitContainer.AddChild(Information);
+
+                var listScrollContainer = new ScrollContainer("ListScrollContainer")
+                {
+                    SizeFlagsVertical = SizeFlags.FillExpand,
+                    SizeFlagsHorizontal = SizeFlags.FillExpand,
+                    HScrollEnabled = true,
+                    VScrollEnabled = true
+                };
+                EntityList = new VBoxContainer("EntityList")
+                {
+                    SizeFlagsHorizontal = SizeFlags.FillExpand
+                };
+                listScrollContainer.AddChild(EntityList);
+                VSplitContainer.AddChild(listScrollContainer);
+                Contents.AddChild(VSplitContainer);
             }
 
             public override void Close()
@@ -147,17 +167,15 @@ namespace Content.Client.GameObjects.Components.Storage
                     {
                         EntityuID = entityuid.Key
                     };
-                    var container = button.GetChild("HBoxContainer");
                     button.ActualButton.OnToggled += OnItemButtonToggled;
                     //Name and Size labels set
-                    container.GetChild<Label>("Name").Text = entity.Name;
-                    container.GetChild<Control>("Control").GetChild<Label>("Size").Text = string.Format("{0}", entityuid.Value);
+                    button.EntityName.Text = entity.Name;
+                    button.EntitySize.Text = string.Format("{0}", entityuid.Value);
 
                     //Gets entity sprite and assigns it to button texture
                     if (entity.TryGetComponent(out ISpriteComponent sprite))
                     {
-                        var view = container.GetChild<SpriteView>("SpriteView");
-                        view.Sprite = sprite;
+                        button.EntitySpriteView.Sprite = sprite;
                     }
 
                     EntityList.AddChild(button);
@@ -193,13 +211,60 @@ namespace Content.Client.GameObjects.Components.Storage
         {
             public EntityUid EntityuID { get; set; }
             public Button ActualButton { get; private set; }
-
-            protected override ResourcePath ScenePath => new ResourcePath("/Scenes/Storage/StorageEntity.tscn");
+            public SpriteView EntitySpriteView { get; private set; }
+            public Control EntityControl { get; private set; }
+            public Label EntityName { get; private set; }
+            public Label EntitySize { get; private set; }
 
             protected override void Initialize()
             {
                 base.Initialize();
-                ActualButton = GetChild<Button>("Button");
+
+                ActualButton = new Button("Button")
+                {
+                    SizeFlagsHorizontal = SizeFlags.FillExpand,
+                    SizeFlagsVertical = SizeFlags.FillExpand,
+                    ToggleMode = true,
+                    MouseFilter = MouseFilterMode.Stop
+                };
+                AddChild(ActualButton);
+
+                var hBoxContainer = new HBoxContainer("HBoxContainer") {MouseFilter = MouseFilterMode.Ignore};
+                EntitySpriteView = new SpriteView("SpriteView")
+                {
+                    CustomMinimumSize = new Vector2(32.0f, 32.0f), MouseFilter = MouseFilterMode.Ignore
+                };
+                EntityName = new Label("Name")
+                {
+                    SizeFlagsVertical = SizeFlags.ShrinkCenter,
+                    Text = "Backpack",
+                    MouseFilter = MouseFilterMode.Ignore
+                };
+                hBoxContainer.AddChild(EntitySpriteView);
+                hBoxContainer.AddChild(EntityName);
+
+                EntityControl = new Control("Control")
+                {
+                    SizeFlagsHorizontal = SizeFlags.FillExpand, MouseFilter = MouseFilterMode.Ignore
+                };
+                EntitySize = new Label("Size")
+                {
+                    SizeFlagsVertical = SizeFlags.ShrinkCenter,
+                    Text = "Size 6",
+                    Align = Label.AlignMode.Right,
+                    AnchorLeft = 1.0f,
+                    AnchorRight = 1.0f,
+                    AnchorBottom = 0.5f,
+                    AnchorTop = 0.5f,
+                    MarginLeft = -38.0f,
+                    MarginTop = -7.0f,
+                    MarginRight = -5.0f,
+                    MarginBottom = 7.0f
+                };
+
+                EntityControl.AddChild(EntitySize);
+                hBoxContainer.AddChild(EntityControl);
+                AddChild(hBoxContainer);
             }
         }
     }
diff --git a/Resources/Scenes/Storage/Storage.tscn b/Resources/Scenes/Storage/Storage.tscn
deleted file mode 100644
index 8e7c2708fe..0000000000
--- a/Resources/Scenes/Storage/Storage.tscn
+++ /dev/null
@@ -1,207 +0,0 @@
-[gd_scene load_steps=3 format=2]
-
-[ext_resource path="res://Engine/Scenes/SS14Window/closewindow.png" type="Texture" id=1]
-
-[sub_resource type="StyleBoxFlat" id=1]
-
-content_margin_left = -1.0
-content_margin_right = -1.0
-content_margin_top = -1.0
-content_margin_bottom = -1.0
-bg_color = Color( 0.234375, 0.234375, 0.234375, 1 )
-draw_center = true
-border_width_left = 0
-border_width_top = 0
-border_width_right = 0
-border_width_bottom = 0
-border_color = Color( 0.8, 0.8, 0.8, 1 )
-border_blend = false
-corner_radius_top_left = 0
-corner_radius_top_right = 0
-corner_radius_bottom_right = 0
-corner_radius_bottom_left = 0
-corner_detail = 8
-expand_margin_left = 0.0
-expand_margin_right = 0.0
-expand_margin_top = 0.0
-expand_margin_bottom = 0.0
-shadow_color = Color( 0, 0, 0, 0.6 )
-shadow_size = 0
-anti_aliasing = true
-anti_aliasing_size = 1
-
-[node name="SS14Window" type="Panel" index="0"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_left = 100.0
-margin_top = 38.0
-margin_right = 361.0
-margin_bottom = 406.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-
-[node name="Contents" type="Container" parent="." index="0"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 1.0
-anchor_bottom = 1.0
-margin_left = 10.0
-margin_top = 40.0
-margin_right = -10.0
-margin_bottom = -12.0
-rect_min_size = Vector2( 50, 50 )
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 2
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-_sections_unfolded = [ "Anchor", "Margin", "Mouse", "Rect" ]
-
-[node name="VSplitContainer" type="VSplitContainer" parent="Contents" index="0"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 1.0
-anchor_bottom = 1.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 1
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-split_offset = 0
-collapsed = false
-dragger_visibility = 0
-_sections_unfolded = [ "Anchor", "Grow Direction", "Hint", "Margin", "Rect" ]
-
-[node name="Information" type="Label" parent="Contents/VSplitContainer" index="0"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_right = 241.0
-margin_bottom = 14.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 2
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 4
-text = "Items: 0 Volume: 0/0 Stuff"
-align = 1
-percent_visible = 1.0
-lines_skipped = 0
-max_lines_visible = -1
-_sections_unfolded = [ "Anchor", "Margin" ]
-
-[node name="ListScrollContainer" type="ScrollContainer" parent="Contents/VSplitContainer" index="1"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_top = 26.0
-margin_right = 241.0
-margin_bottom = 316.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = true
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 3
-size_flags_vertical = 1
-scroll_horizontal_enabled = true
-scroll_horizontal = 0
-scroll_vertical_enabled = true
-scroll_vertical = 0
-_sections_unfolded = [ "Anchor", "Focus", "Grow Direction", "Hint", "Margin", "Material", "Mouse", "Pause", "Rect", "Scroll", "Size Flags", "Theme", "Visibility" ]
-
-[node name="EntityList" type="VBoxContainer" parent="Contents/VSplitContainer/ListScrollContainer" index="0"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_right = 241.0
-margin_bottom = 176.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 1
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 3
-size_flags_vertical = 1
-alignment = 1
-_sections_unfolded = [ "Anchor", "Focus", "Hint", "Margin", "Mouse", "Rect", "Size Flags", "Theme", "custom_constants" ]
-
-[node name="Header" type="Panel" parent="." index="1"]
-
-editor/display_folded = true
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 1.0
-anchor_bottom = 0.0
-margin_bottom = 25.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 2
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-custom_styles/panel = SubResource( 1 )
-_sections_unfolded = [ "Margin", "Mouse", "custom_styles" ]
-
-[node name="Header Text" type="Label" parent="Header" index="0"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 1.0
-anchor_bottom = 1.0
-margin_right = -25.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 2
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 4
-text = "Storage Item"
-align = 1
-valign = 1
-clip_text = true
-percent_visible = 1.0
-lines_skipped = 0
-max_lines_visible = -1
-_sections_unfolded = [ "Margin", "Mouse" ]
-
-[node name="CloseButton" type="TextureButton" parent="Header" index="1"]
-
-anchor_left = 1.0
-anchor_top = 0.0
-anchor_right = 1.0
-anchor_bottom = 1.0
-margin_left = -25.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
-texture_normal = ExtResource( 1 )
-expand = true
-stretch_mode = 5
-_sections_unfolded = [ "Margin", "Textures" ]
-
-
diff --git a/Resources/Scenes/Storage/StorageEntity.tscn b/Resources/Scenes/Storage/StorageEntity.tscn
deleted file mode 100644
index 0d0407411f..0000000000
--- a/Resources/Scenes/Storage/StorageEntity.tscn
+++ /dev/null
@@ -1,131 +0,0 @@
-[gd_scene load_steps=3 format=2]
-
-[ext_resource path="res://Engine/Scenes/SpriteMirror/SpriteView.tscn" type="PackedScene" id=1]
-
-[sub_resource type="StyleBoxEmpty" id=1]
-
-content_margin_left = -1.0
-content_margin_right = -1.0
-content_margin_top = -1.0
-content_margin_bottom = -1.0
-
-[node name="StorageEntity" type="PanelContainer"]
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 1.0
-anchor_bottom = 1.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 3
-size_flags_vertical = 1
-custom_styles/panel = SubResource( 1 )
-_sections_unfolded = [ "Focus", "Hint", "Material", "Mouse", "Rect", "Size Flags", "Theme", "Visibility", "custom_styles" ]
-
-[node name="Button" type="Button" parent="."]
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_right = 1024.0
-margin_bottom = 600.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 3
-size_flags_vertical = 3
-toggle_mode = true
-enabled_focus_mode = 2
-shortcut = null
-group = null
-flat = false
-align = 1
-_sections_unfolded = [ "Grow Direction", "Size Flags" ]
-
-[node name="HBoxContainer" type="HBoxContainer" parent="."]
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_right = 1024.0
-margin_bottom = 600.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 2
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-alignment = 0
-_sections_unfolded = [ "Anchor", "Grow Direction", "Hint", "Margin", "Mouse", "Rect", "Size Flags", "Theme", "custom_constants" ]
-
-[node name="SpriteView" parent="HBoxContainer" instance=ExtResource( 1 )]
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_right = 32.0
-margin_bottom = 600.0
-rect_min_size = Vector2( 32, 32 )
-_sections_unfolded = [ "Rect" ]
-
-[node name="Name" type="Label" parent="HBoxContainer"]
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_left = 36.0
-margin_top = 293.0
-margin_right = 95.0
-margin_bottom = 307.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 2
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 4
-text = "Backpack"
-percent_visible = 1.0
-lines_skipped = 0
-max_lines_visible = -1
-_sections_unfolded = [ "Anchor" ]
-
-[node name="Control" type="Control" parent="HBoxContainer"]
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_left = 99.0
-margin_right = 1024.0
-margin_bottom = 600.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 2
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 3
-size_flags_vertical = 1
-_sections_unfolded = [ "Mouse", "Size Flags" ]
-
-[node name="Size" type="Label" parent="HBoxContainer/Control"]
-anchor_left = 1.0
-anchor_top = 0.5
-anchor_right = 1.0
-anchor_bottom = 0.5
-margin_left = -38.0
-margin_top = -7.0
-margin_right = -5.0
-margin_bottom = 7.0
-grow_horizontal = 0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 2
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 4
-text = "Size 6"
-align = 2
-percent_visible = 1.0
-lines_skipped = 0
-max_lines_visible = -1
-_sections_unfolded = [ "Margin", "Mouse" ]
-

From bc3942127bfe6bee5cb671a34126dfd3c52c1723 Mon Sep 17 00:00:00 2001
From: moneyl <8206401+Moneyl@users.noreply.github.com>
Date: Fri, 17 May 2019 10:36:29 -0400
Subject: [PATCH 08/10] Fixed construction menu default size being huge

---
 Content.Client/Construction/ConstructionButton.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Content.Client/Construction/ConstructionButton.cs b/Content.Client/Construction/ConstructionButton.cs
index 5bab5217ef..9a73f023f4 100644
--- a/Content.Client/Construction/ConstructionButton.cs
+++ b/Content.Client/Construction/ConstructionButton.cs
@@ -1,6 +1,7 @@
 using Content.Client.GameObjects.Components.Construction;
 using Robust.Client.Interfaces.Graphics;
 using Robust.Client.UserInterface.Controls;
+using Robust.Shared.Maths;
 using Robust.Shared.Utility;
 
 namespace Content.Client.Construction
@@ -40,7 +41,10 @@ namespace Content.Client.Construction
 
         private void PerformLayout()
         {
-            Menu = new ConstructionMenu(_displayManager);
+            Menu = new ConstructionMenu(_displayManager)
+            {
+                Size = new Vector2(500.0f, 350.0f)
+            };
             Menu.AddToScreen();
         }
 

From 338a8e463e10260b625592ecdc8cb81cf7abfad6 Mon Sep 17 00:00:00 2001
From: moneyl <8206401+Moneyl@users.noreply.github.com>
Date: Fri, 24 May 2019 16:24:32 -0400
Subject: [PATCH 09/10] Move GUI size init into constructor

Setting the initial size in `Initialize` has no effect on the windows size so it's set in the constructor instead.
---
 Content.Client/Construction/ConstructionButton.cs          | 7 ++-----
 Content.Client/Construction/ConstructionMenu.cs            | 6 +++++-
 .../Components/Storage/ClientStorageComponent.cs           | 7 +++++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/Content.Client/Construction/ConstructionButton.cs b/Content.Client/Construction/ConstructionButton.cs
index 9a73f023f4..f57f54a0ff 100644
--- a/Content.Client/Construction/ConstructionButton.cs
+++ b/Content.Client/Construction/ConstructionButton.cs
@@ -1,4 +1,4 @@
-using Content.Client.GameObjects.Components.Construction;
+using Content.Client.GameObjects.Components.Construction;
 using Robust.Client.Interfaces.Graphics;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Maths;
@@ -41,10 +41,7 @@ namespace Content.Client.Construction
 
         private void PerformLayout()
         {
-            Menu = new ConstructionMenu(_displayManager)
-            {
-                Size = new Vector2(500.0f, 350.0f)
-            };
+            Menu = new ConstructionMenu(_displayManager);
             Menu.AddToScreen();
         }
 
diff --git a/Content.Client/Construction/ConstructionMenu.cs b/Content.Client/Construction/ConstructionMenu.cs
index 2551cf4a3f..fb0f35670d 100644
--- a/Content.Client/Construction/ConstructionMenu.cs
+++ b/Content.Client/Construction/ConstructionMenu.cs
@@ -48,7 +48,11 @@ namespace Content.Client.Construction
         // This list is flattened in such a way that the top most deepest category is first.
         List<CategoryNode> FlattenedCategories;
         PlacementManager Placement;
-        public ConstructionMenu(IDisplayManager displayMan) : base(displayMan) { }
+
+        public ConstructionMenu(IDisplayManager displayMan) : base(displayMan)
+        {
+            Size = new Vector2(500.0f, 350.0f);
+        }
 
         protected override void Initialize()
         {
diff --git a/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs b/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs
index 03486aa4c2..ff0b90eeea 100644
--- a/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs
+++ b/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs
@@ -32,7 +32,7 @@ namespace Content.Client.GameObjects.Components.Storage
             base.OnAdd();
 
             Window = new StorageWindow(IoCManager.Resolve<IDisplayManager>())
-            { StorageEntity = this, Size = new Vector2(180.0f, 320.0f)};
+            { StorageEntity = this};
         }
 
         public override void OnRemove()
@@ -109,7 +109,10 @@ namespace Content.Client.GameObjects.Components.Storage
             private Label Information;
             public ClientStorageComponent StorageEntity;
 
-            public StorageWindow(IDisplayManager displayMan) : base(displayMan) { }
+            public StorageWindow(IDisplayManager displayMan) : base(displayMan)
+            {
+                Size = new Vector2(180.0f, 320.0f);
+            }
 
             protected override void Initialize()
             {

From b9f7c65c0552acb4e9b8ea1e20f8a99cbf2e7d42 Mon Sep 17 00:00:00 2001
From: moneyl <8206401+Moneyl@users.noreply.github.com>
Date: Fri, 24 May 2019 16:25:07 -0400
Subject: [PATCH 10/10] Use SetAnchorPreset instead of manually setting each
 anchor

---
 Content.Client/Construction/ConstructionButton.cs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Content.Client/Construction/ConstructionButton.cs b/Content.Client/Construction/ConstructionButton.cs
index f57f54a0ff..ecf00408f8 100644
--- a/Content.Client/Construction/ConstructionButton.cs
+++ b/Content.Client/Construction/ConstructionButton.cs
@@ -1,4 +1,4 @@
-using Content.Client.GameObjects.Components.Construction;
+using Content.Client.GameObjects.Components.Construction;
 using Robust.Client.Interfaces.Graphics;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Maths;
@@ -27,10 +27,7 @@ namespace Content.Client.Construction
         {
             base.Initialize();
 
-            AnchorLeft = 1.0f;
-            AnchorTop = 1.0f;
-            AnchorRight = 1.0f;
-            AnchorBottom = 1.0f;
+            SetAnchorPreset(LayoutPreset.BottomRight);
             MarginLeft = -110.0f;
             MarginTop = -70.0f;
             MarginRight = -50.0f;