dave/Tarkov-UIFixes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix dragging multiselect onto trading table

Browse Source
This commit is contained in:
Tyfon
2024-06-22 15:06:10 -07:00
parent cf6d38cc05
commit df1803c385
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Patches/MultiSelectPatches.cs
View File

@@ -943,6 +943,8 @@ namespace UIFixes
LocationInGrid hoveredLocation = __instance.CalculateItemLocation(itemContext); LocationInGrid hoveredLocation = __instance.CalculateItemLocation(itemContext);
GClass2769 hoveredAddress = new(__instance.Grid, hoveredLocation); GClass2769 hoveredAddress = new(__instance.Grid, hoveredLocation);
DisableMerge = true;
Stack<GStruct413> operations = new(); Stack<GStruct413> operations = new();
foreach (ItemContextClass selectedItemContext in MultiSelect.SortedItemContexts(itemContext)) foreach (ItemContextClass selectedItemContext in MultiSelect.SortedItemContexts(itemContext))
{ {
@@ -980,6 +982,7 @@ namespace UIFixes
firstItem = false; firstItem = false;
} }
DisableMerge = false;
FindOrigin = null; FindOrigin = null;
if (!__result) if (!__result)
@@ -1021,6 +1024,8 @@ namespace UIFixes
traderAssortmentController.PrepareToSell(itemContext.Item, hoveredLocation); traderAssortmentController.PrepareToSell(itemContext.Item, hoveredLocation);
itemContext.CloseDependentWindows(); itemContext.CloseDependentWindows();
DisableMerge = true;
// For the rest of the items, still need to use quickfind // For the rest of the items, still need to use quickfind
foreach (ItemContextClass selectedItemContext in MultiSelect.SortedItemContexts(itemContext, false)) foreach (ItemContextClass selectedItemContext in MultiSelect.SortedItemContexts(itemContext, false))
{ {
@@ -1039,6 +1044,7 @@ namespace UIFixes
traderAssortmentController.PrepareToSell(selectedItemContext.Item, gridAddress.LocationInGrid); traderAssortmentController.PrepareToSell(selectedItemContext.Item, gridAddress.LocationInGrid);
} }
DisableMerge = false;
FindOrigin = null; FindOrigin = null;
MultiSelect.Clear(); // explicitly clear since the items are no longer selectable MultiSelect.Clear(); // explicitly clear since the items are no longer selectable