Create BoundUserInterfaces with DynamicTypeFactory (content) (#332)
* Create BoundUserInterfaces with DynamicTypeFactory (content) * maybe this time I did it right
This commit is contained in:
committed by
Pieter-Jan Briers
parent
5c40300474
commit
63bb4c4d0a
@@ -20,7 +20,6 @@ namespace Content.Client.GameObjects.Components.Access
|
||||
|
||||
protected override void Open()
|
||||
{
|
||||
IoCManager.InjectDependencies(this);
|
||||
base.Open();
|
||||
|
||||
_window = new IdCardConsoleWindow(this, _localizationManager);
|
||||
|
||||
@@ -37,7 +37,6 @@ namespace Content.Client.GameObjects.Components.Research
|
||||
protected override void Open()
|
||||
{
|
||||
base.Open();
|
||||
IoCManager.InjectDependencies(this);
|
||||
|
||||
if (!Owner.Owner.TryGetComponent(out MaterialStorageComponent storage)
|
||||
|| !Owner.Owner.TryGetComponent(out SharedLatheComponent lathe)
|
||||
|
||||
@@ -1,12 +1,17 @@
|
||||
using System;
|
||||
using Robust.Client.GameObjects.Components.UserInterface;
|
||||
using Robust.Shared.GameObjects.Components.UserInterface;
|
||||
using Robust.Shared.IoC;
|
||||
using Robust.Shared.Localization;
|
||||
using static Content.Shared.GameObjects.Components.SharedWiresComponent;
|
||||
|
||||
namespace Content.Client.GameObjects.Components.Wires
|
||||
{
|
||||
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)
|
||||
{
|
||||
}
|
||||
@@ -16,7 +21,7 @@ namespace Content.Client.GameObjects.Components.Wires
|
||||
protected override void Open()
|
||||
{
|
||||
base.Open();
|
||||
_menu = new WiresMenu() {Owner = this};
|
||||
_menu = new WiresMenu(_localizationManager) {Owner = this};
|
||||
|
||||
_menu.OnClose += Close;
|
||||
_menu.OpenCentered();
|
||||
|
||||
@@ -10,17 +10,15 @@ namespace Content.Client.GameObjects.Components.Wires
|
||||
{
|
||||
public class WiresMenu : SS14Window
|
||||
{
|
||||
#pragma warning disable 649
|
||||
[Dependency] private readonly ILocalizationManager _localizationManager;
|
||||
#pragma warning restore 649
|
||||
private readonly ILocalizationManager _localizationManager;
|
||||
protected override Vector2? CustomSize => (300, 450);
|
||||
public WiresBoundUserInterface Owner { get; set; }
|
||||
|
||||
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");
|
||||
_wiresContainer = new VBoxContainer();
|
||||
Contents.AddChild(_wiresContainer);
|
||||
|
||||
Submodule RobustToolbox updated: 782f36ee63...566ed9cbdc
Reference in New Issue
Block a user