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

Miscellaneous inventory tweaks (#22371)

Browse Source 
* pt 1

* Miscellaneous gridinv UX
This commit is contained in:
Nemanja
2023-12-12 02:49:37 -05:00
committed by GitHub
parent 405e569cd5
commit 9de4c40c29
5 changed files with 82 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs
View File

@@ -6,7 +6,6 @@ using Robust.Client.GameObjects;
using Robust.Client.Graphics;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.CustomControls;
using YamlDotNet.Core;
namespace Content.Client.UserInterface.Systems.Storage.Controls;
@@ -103,7 +102,7 @@ public sealed class ItemGridPiece : Control
return;
}
if (_storageController.IsDragging && _storageController.CurrentlyDragging == this)
if (_storageController.IsDragging && _storageController.DraggingGhost?.Entity == Entity && _storageController.DraggingGhost != this)
return;
var adjustedShape = _entityManager.System<ItemSystem>().GetAdjustedItemShape((Entity, itemComponent), Location.Rotation, Vector2i.Zero);
@@ -177,7 +176,7 @@ public sealed class ItemGridPiece : Control
handle.SetTransform(pos, iconRotation);
var box = new UIBox2(root, root + sprite.Size * scale);
handle.DrawTextureRect(sprite, box);
handle.SetTransform(Matrix3.Identity);
handle.SetTransform(GlobalPixelPosition, Angle.Zero);
}
else
{

1
Content.Client/UserInterface/Systems/Storage/Controls/StorageContainer.cs
View File

@@ -445,6 +445,7 @@ public sealed class StorageContainer : BaseWindow
_entity.GetNetEntity(handEntity),
_entity.GetNetEntity(StorageEntity.Value),
insertLocation));
_storageController.DraggingRotation = Angle.Zero;
args.Handle();
}
}

46
Content.Client/UserInterface/Systems/Storage/StorageUIController.cs
View File

@@ -263,29 +263,55 @@ public sealed class StorageUIController : UIController, IOnSystemChanged<Storage
private void OnPieceUnpressed(GUIBoundKeyEventArgs args, ItemGridPiece control)
{
if (_container?.StorageEntity is not { } storageEnt)
if (args.Function != ContentKeyFunctions.MoveStoredItem)
return;
if (args.Function == ContentKeyFunctions.MoveStoredItem)
if (_container?.StorageEntity is not { } storageEnt|| !_entity.TryGetComponent<StorageComponent>(storageEnt, out var storageComp))
return;
if (DraggingGhost is { } draggingGhost)
{
if (DraggingGhost is { } draggingGhost)
var dragEnt = draggingGhost.Entity;
var dragLoc = draggingGhost.Location;
var itemSys = _entity.System<SharedItemSystem>();
var position = _container.GetMouseGridPieceLocation(dragEnt, dragLoc);
var itemBounding = itemSys.GetAdjustedItemShape(dragEnt, dragLoc).GetBoundingBox();
var gridBounding = storageComp.Grid.GetBoundingBox();
// The extended bounding box for if this is out of the window is the grid bounding box dimensions combined
// with the item shape bounding box dimensions. Plus 1 on the left for the sidebar. This makes it so that.
// dropping an item on the floor requires dragging it all the way out of the window.
var left = gridBounding.Left - itemBounding.Width - 1;
var bottom = gridBounding.Bottom - itemBounding.Height;
var top = gridBounding.Top;
var right = gridBounding.Right;
var lenientBounding = new Box2i(left, bottom, right, top);
if (lenientBounding.Contains(position))
{
var position = _container.GetMouseGridPieceLocation(draggingGhost.Entity, draggingGhost.Location);
_entity.RaisePredictiveEvent(new StorageSetItemLocationEvent(
_entity.GetNetEntity(draggingGhost.Entity),
_entity.GetNetEntity(storageEnt),
new ItemStorageLocation(DraggingRotation, position)));
_container?.BuildItemPieces();
}
else //if we just clicked, then take it out of the bag.
else
{
_entity.RaisePredictiveEvent(new StorageInteractWithItemEvent(
_entity.GetNetEntity(control.Entity),
_entity.RaisePredictiveEvent(new StorageRemoveItemEvent(
_entity.GetNetEntity(draggingGhost.Entity),
_entity.GetNetEntity(storageEnt)));
}
_menuDragHelper.EndDrag();
args.Handle();
_container?.BuildItemPieces();
}
else //if we just clicked, then take it out of the bag.
{
_entity.RaisePredictiveEvent(new StorageInteractWithItemEvent(
_entity.GetNetEntity(control.Entity),
_entity.GetNetEntity(storageEnt)));
}
_menuDragHelper.EndDrag();
args.Handle();
}
private bool OnMenuBeginDrag()