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

Fix multiselect refreshing to parent context

Browse Source
This commit is contained in:
Tyfon
2024-07-16 00:59:35 -07:00
parent e731a4fec4
commit a35c0f1084
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Multiselect/MultiSelect.cs
View File

@@ -162,7 +162,10 @@ public class MultiSelect
if (oldItemContext != null)
{
MultiSelectItemContext newContext = oldItemContext.Refresh();
SelectedItems.Add(newContext, SelectedItems[oldItemContext]);
if (newContext != null)
{
SelectedItems.Add(newContext, SelectedItems[oldItemContext]);
}
SelectedItems.Remove(oldItemContext);
oldItemContext.Dispose();
@@ -463,7 +466,12 @@ public class MultiSelectItemContext : DragItemContext
public MultiSelectItemContext Refresh()
{
return new MultiSelectItemContext(ItemContextAbstractClass, ItemRotation);
if (Item == ItemContextAbstractClass.Item)
{
return new MultiSelectItemContext(ItemContextAbstractClass, ItemRotation);
}
return null;
}
public void UpdateDragContext(DragItemContext itemContext)

4
Multiselect/MultiSelectDebug.cs
View File

@@ -66,9 +66,7 @@ public class MultiSelectDebug : MonoBehaviour
}
ItemAddress address = itemContext is DragItemContext dragItemContext ? dragItemContext.ItemAddress : itemContext.Item.CurrentAddress;
LocationInGrid location = address is GridItemAddress gridAddress ?
itemContext is MultiSelectItemContext ? MultiGrid.GetGridLocation(gridAddress) : gridAddress.LocationInGrid :
null;
LocationInGrid location = address is GridItemAddress gridAddress ? gridAddress.LocationInGrid : null;
string locationString = location != null ? $"({location.x}, {location.y})" : "(slot)";
return $"x{itemContext.Item.StackObjectsCount} {address.Container.ID} {locationString} {itemContext.Item.Name.Localized()}";