tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move GUI size init into constructor

Browse Source 
Setting the initial size in `Initialize` has no effect on the windows size so it's set in the constructor instead.
This commit is contained in:
moneyl
2019-05-24 16:24:32 -04:00
parent f489bee686
commit 338a8e463e
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Client/Construction/ConstructionButton.cs
View File

@@ -1,4 +1,4 @@
using Content.Client.GameObjects.Components.Construction; using Content.Client.GameObjects.Components.Construction;
using Robust.Client.Interfaces.Graphics; using Robust.Client.Interfaces.Graphics;
using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
using Robust.Shared.Maths; using Robust.Shared.Maths;
@@ -41,10 +41,7 @@ namespace Content.Client.Construction
private void PerformLayout() private void PerformLayout()
{ {
Menu = new ConstructionMenu(_displayManager) Menu = new ConstructionMenu(_displayManager);
{
Size = new Vector2(500.0f, 350.0f)
};
Menu.AddToScreen(); Menu.AddToScreen();
} }

6
Content.Client/Construction/ConstructionMenu.cs
View File

@@ -48,7 +48,11 @@ namespace Content.Client.Construction
// This list is flattened in such a way that the top most deepest category is first. // This list is flattened in such a way that the top most deepest category is first.
List<CategoryNode> FlattenedCategories; List<CategoryNode> FlattenedCategories;
PlacementManager Placement; 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() protected override void Initialize()
{ {

7
Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs
View File

@@ -32,7 +32,7 @@ namespace Content.Client.GameObjects.Components.Storage
base.OnAdd(); base.OnAdd();
Window = new StorageWindow(IoCManager.Resolve<IDisplayManager>()) Window = new StorageWindow(IoCManager.Resolve<IDisplayManager>())
{ StorageEntity = this, Size = new Vector2(180.0f, 320.0f)}; { StorageEntity = this};
} }
public override void OnRemove() public override void OnRemove()
@@ -109,7 +109,10 @@ namespace Content.Client.GameObjects.Components.Storage
private Label Information; private Label Information;
public ClientStorageComponent StorageEntity; 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() protected override void Initialize()
{ {