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
{