General storage fixes (#34845)
* Fix storage stars * Fix some more storage bugs - Fix positions not saving. - Fix the 1-tick delay between parent and child storage UIs opening / closing. - Fix BackButton being visible sometimes when it shouldn't be. * milon is a furry
This commit is contained in:
@@ -1,8 +1,10 @@
|
||||
using System.Numerics;
|
||||
using Content.Client.UserInterface.Systems.Storage;
|
||||
using Content.Client.UserInterface.Systems.Storage.Controls;
|
||||
using Content.Shared.Storage;
|
||||
using JetBrains.Annotations;
|
||||
using Robust.Client.UserInterface;
|
||||
using Robust.Client.UserInterface.Controls;
|
||||
|
||||
namespace Content.Client.Storage;
|
||||
|
||||
@@ -11,6 +13,8 @@ public sealed class StorageBoundUserInterface : BoundUserInterface
|
||||
{
|
||||
private StorageWindow? _window;
|
||||
|
||||
public Vector2? Position => _window?.Position;
|
||||
|
||||
public StorageBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
|
||||
{
|
||||
}
|
||||
@@ -21,7 +25,7 @@ public sealed class StorageBoundUserInterface : BoundUserInterface
|
||||
|
||||
_window = IoCManager.Resolve<IUserInterfaceManager>()
|
||||
.GetUIController<StorageUIController>()
|
||||
.CreateStorageWindow(Owner);
|
||||
.CreateStorageWindow(this);
|
||||
|
||||
if (EntMan.TryGetComponent(Owner, out StorageComponent? storage))
|
||||
{
|
||||
@@ -50,10 +54,20 @@ public sealed class StorageBoundUserInterface : BoundUserInterface
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
base.Dispose(disposing);
|
||||
|
||||
Reclaim();
|
||||
}
|
||||
|
||||
public void CloseWindow(Vector2 position)
|
||||
{
|
||||
if (_window == null)
|
||||
return;
|
||||
|
||||
// Update its position before potentially saving.
|
||||
// Listen it makes sense okay.
|
||||
LayoutContainer.SetPosition(_window, position);
|
||||
_window?.Close();
|
||||
}
|
||||
|
||||
public void Hide()
|
||||
{
|
||||
if (_window == null)
|
||||
@@ -70,6 +84,15 @@ public sealed class StorageBoundUserInterface : BoundUserInterface
|
||||
_window.Visible = true;
|
||||
}
|
||||
|
||||
public void Show(Vector2 position)
|
||||
{
|
||||
if (_window == null)
|
||||
return;
|
||||
|
||||
Show();
|
||||
LayoutContainer.SetPosition(_window, position);
|
||||
}
|
||||
|
||||
public void ReOpen()
|
||||
{
|
||||
_window?.Orphan();
|
||||
|
||||
Reference in New Issue
Block a user