Merge remote-tracking branch 'origin/master' into dev/pie-lover
This commit is contained in:
@@ -5,6 +5,8 @@ using AetherBags.Inventory;
|
|||||||
using AetherBags.Nodes.Layout;
|
using AetherBags.Nodes.Layout;
|
||||||
using FFXIVClientStructs.FFXIV.Client.Game;
|
using FFXIVClientStructs.FFXIV.Client.Game;
|
||||||
using FFXIVClientStructs.FFXIV.Client.UI;
|
using FFXIVClientStructs.FFXIV.Client.UI;
|
||||||
|
using FFXIVClientStructs.FFXIV.Client.UI.Agent;
|
||||||
|
using FFXIVClientStructs.FFXIV.Client.UI.Misc;
|
||||||
using FFXIVClientStructs.FFXIV.Component.GUI;
|
using FFXIVClientStructs.FFXIV.Component.GUI;
|
||||||
using KamiToolKit.Classes;
|
using KamiToolKit.Classes;
|
||||||
using KamiToolKit.Nodes;
|
using KamiToolKit.Nodes;
|
||||||
@@ -233,6 +235,7 @@ public class InventoryCategoryNode : SimpleComponentNode
|
|||||||
Int2 = location.Slot,
|
Int2 = location.Slot,
|
||||||
},
|
},
|
||||||
IsClickable = true,
|
IsClickable = true,
|
||||||
|
OnDiscard = node => OnDiscard(node, data),
|
||||||
OnEnd = _ => System.AddonInventoryWindow.ManualInventoryRefresh(),
|
OnEnd = _ => System.AddonInventoryWindow.ManualInventoryRefresh(),
|
||||||
OnPayloadAccepted = (node, payload) => OnPayloadAccepted(node, payload, data),
|
OnPayloadAccepted = (node, payload) => OnPayloadAccepted(node, payload, data),
|
||||||
OnRollOver = node =>
|
OnRollOver = node =>
|
||||||
@@ -251,6 +254,12 @@ public class InventoryCategoryNode : SimpleComponentNode
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private unsafe void OnDiscard(DragDropNode node, ItemInfo item)
|
||||||
|
{
|
||||||
|
uint addonId = RaptureAtkUnitManager.Instance()->GetAddonByNode(node)->Id;
|
||||||
|
AgentInventoryContext.Instance()->DiscardItem(item.Item.GetLinkedItem(), item.Item.Container, item.Item.Slot, addonId);
|
||||||
|
}
|
||||||
|
|
||||||
private void OnPayloadAccepted(DragDropNode _, DragDropPayload payload, ItemInfo targetItemInfo)
|
private void OnPayloadAccepted(DragDropNode _, DragDropPayload payload, ItemInfo targetItemInfo)
|
||||||
{
|
{
|
||||||
if (!payload.IsValidInventoryPayload)
|
if (!payload.IsValidInventoryPayload)
|
||||||
|
|||||||
Reference in New Issue
Block a user