erik/acdream
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix(inventory): correct drag overlay priority

Browse source 
Keep the persistent selection indicator above retail's waiting mesh, use the normal green accept circle for backpack-grid placement, and reserve the green drop-in arrow for bag-column containers as ItemList_DragOver does.

Co-Authored-By: Codex <codex@openai.com>
This commit is contained in:
Erik 2026-07-13 09:21:22 +02:00
parent ace5880fed
commit 64a056e656
6 changed files with 63 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/AcDream.App/UI/UiItemSlot.cs
View file

@ -338,10 +338,22 @@ public sealed class UiItemSlot : UiElement
}
}
// Pending/drag-source mesh — retail UIElement_UIItem::SetWaitingState (0x004e11b0)
// reveals m_elem_Icon_Ghosted (0x10000349). ItemList_BeginDrag (0x004e32d0)
// sets it for physical inventory/equipment cells while leaving their icon in place.
// Draw it before the persistent selected/open indicators: retail keeps selection visible
// while the source is waiting, so the grey mesh must not erase the selected square.
if (_waiting && SpriteResolve is not null && WaitingSprite != 0)
{
var (tex, _, _) = SpriteResolve(WaitingSprite);
if (tex != 0)
ctx.DrawSprite(tex, 0f, 0f, Width, Height, 0f, 0f, 1f, 1f, Vector4.One);
}
// Open-container triangle (retail SetOpenContainerState 0x004e1200) + selected-item square
// (retail SetSelectedState 0x004e1240). Drawn procedurally like the digit/drag overlays;
// guard id != 0 BEFORE resolving (feedback_ui_resolve_zero_magenta). Triangle under the
// square; both under the transient drag overlay below.
// square; both remain above the transient waiting mesh and below drag-accept feedback.
if (IsOpenContainer && SpriteResolve is not null && OpenContainerSprite != 0)
{
var (tex, _, _) = SpriteResolve(OpenContainerSprite);
@ -355,16 +367,6 @@ public sealed class UiItemSlot : UiElement
ctx.DrawSprite(tex, 0f, 0f, Width, Height, 0f, 0f, 1f, 1f, Vector4.One);
}
// Pending/drag-source mesh — retail UIElement_UIItem::SetWaitingState (0x004e11b0)
// reveals m_elem_Icon_Ghosted (0x10000349). ItemList_BeginDrag (0x004e32d0)
// sets it for physical inventory/equipment cells while leaving their icon in place.
if (_waiting && SpriteResolve is not null && WaitingSprite != 0)
{
var (tex, _, _) = SpriteResolve(WaitingSprite);
if (tex != 0)
ctx.DrawSprite(tex, 0f, 0f, Width, Height, 0f, 0f, 1f, 1f, Vector4.One);
}
// Drag-rollover accept/reject frame (retail SetDragAcceptState 0x10000041/40).
// Guard id != 0 BEFORE resolving — resolve(0) returns the 1×1 magenta placeholder
// with a non-zero GL handle (feedback_ui_resolve_zero_magenta).