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] 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 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()) - { 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() {