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

Create BoundUserInterfaces with DynamicTypeFactory (content) (#332)

Browse Source 
* Create BoundUserInterfaces with DynamicTypeFactory (content)

* maybe this time I did it right
This commit is contained in:
DamianX
2019-09-08 16:05:34 +02:00
committed by Pieter-Jan Briers
parent 5c40300474
commit 63bb4c4d0a
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Client/GameObjects/Components/Access/IdCardConsoleBoundUserInterface.cs
View File

@@ -20,7 +20,6 @@ namespace Content.Client.GameObjects.Components.Access
protected override void Open() protected override void Open()
{ {
IoCManager.InjectDependencies(this);
base.Open(); base.Open();
_window = new IdCardConsoleWindow(this, _localizationManager); _window = new IdCardConsoleWindow(this, _localizationManager);

1
Content.Client/GameObjects/Components/Research/LatheBoundUserInterface.cs
View File

@@ -37,7 +37,6 @@ namespace Content.Client.GameObjects.Components.Research
protected override void Open() protected override void Open()
{ {
base.Open(); base.Open();
IoCManager.InjectDependencies(this);
if (!Owner.Owner.TryGetComponent(out MaterialStorageComponent storage) if (!Owner.Owner.TryGetComponent(out MaterialStorageComponent storage)
|| !Owner.Owner.TryGetComponent(out SharedLatheComponent lathe) || !Owner.Owner.TryGetComponent(out SharedLatheComponent lathe)

7
Content.Client/GameObjects/Components/Wires/WiresBoundUserInterface.cs
View File

@@ -1,12 +1,17 @@
using System; using System;
using Robust.Client.GameObjects.Components.UserInterface; using Robust.Client.GameObjects.Components.UserInterface;
using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.GameObjects.Components.UserInterface;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using static Content.Shared.GameObjects.Components.SharedWiresComponent; using static Content.Shared.GameObjects.Components.SharedWiresComponent;
namespace Content.Client.GameObjects.Components.Wires namespace Content.Client.GameObjects.Components.Wires
{ {
public class WiresBoundUserInterface : BoundUserInterface public class WiresBoundUserInterface : BoundUserInterface
{ {
#pragma warning disable 649
[Dependency] private readonly ILocalizationManager _localizationManager;
#pragma warning restore 649
public WiresBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) public WiresBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
{ {
} }
@@ -16,7 +21,7 @@ namespace Content.Client.GameObjects.Components.Wires
protected override void Open() protected override void Open()
{ {
base.Open(); base.Open();
_menu = new WiresMenu() {Owner = this}; _menu = new WiresMenu(_localizationManager) {Owner = this};
_menu.OnClose += Close; _menu.OnClose += Close;
_menu.OpenCentered(); _menu.OpenCentered();

8
Content.Client/GameObjects/Components/Wires/WiresMenu.cs
View File

@@ -10,17 +10,15 @@ namespace Content.Client.GameObjects.Components.Wires
{ {
public class WiresMenu : SS14Window public class WiresMenu : SS14Window
{ {
#pragma warning disable 649 private readonly ILocalizationManager _localizationManager;
[Dependency] private readonly ILocalizationManager _localizationManager;
#pragma warning restore 649
protected override Vector2? CustomSize => (300, 450); protected override Vector2? CustomSize => (300, 450);
public WiresBoundUserInterface Owner { get; set; } public WiresBoundUserInterface Owner { get; set; }
private readonly VBoxContainer _wiresContainer; private readonly VBoxContainer _wiresContainer;
public WiresMenu() public WiresMenu(ILocalizationManager localizationManager)
{ {
IoCManager.InjectDependencies(this); // TODO: Remove this and use DynamicTypeFactory? _localizationManager = localizationManager;
Title = _localizationManager.GetString("Wires"); Title = _localizationManager.GetString("Wires");
_wiresContainer = new VBoxContainer(); _wiresContainer = new VBoxContainer();
Contents.AddChild(_wiresContainer); Contents.AddChild(_wiresContainer);

2
RobustToolbox

Submodule RobustToolbox updated: 782f36ee63...566ed9cbdc