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] 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);