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

multiselect debug, things seem good?

Browse Source
This commit is contained in:
Tyfon
2024-06-15 17:10:58 -07:00
parent 3c76f3c588
commit b562a8665d
6 changed files with 173 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
MultiSelect.cs
View File

@@ -1,4 +1,5 @@
using EFT.UI.DragAndDrop;
using System;
using System.Collections.Generic;
using System.Linq;
using TMPro;
@@ -11,8 +12,8 @@ namespace UIFixes
private static GameObject SelectedMarkTemplate;
private static GameObject SelectedBackgroundTemplate;
private static readonly HashSet<GridItemView> SelectedItemViews = [];
private static readonly List<ItemContextClass> SelectedItemContexts = [];
private static readonly Dictionary<GridItemView, ItemContextClass> SelectedItemViews = [];
private static readonly List<ItemContextClass> SortedItemContexts = [];
public static void Initialize()
{
@@ -35,7 +36,7 @@ namespace UIFixes
return;
}
if (SelectedItemViews.Contains(itemView))
if (SelectedItemViews.ContainsKey(itemView))
{
Deselect(itemView);
}
@@ -48,7 +49,7 @@ namespace UIFixes
public static void Clear()
{
// ToList() because we'll be modifying the collection
foreach (GridItemView itemView in SelectedItemViews.ToList())
foreach (GridItemView itemView in SelectedItemViews.Keys.ToList())
{
Deselect(itemView);
}
@@ -56,28 +57,39 @@ namespace UIFixes
public static void Select(GridItemView itemView)
{
if (itemView.IsInteractable && SelectedItemViews.Add(itemView))
if (itemView.IsInteractable && !SelectedItemViews.ContainsKey(itemView))
{
ItemContextClass itemContext = new ItemContextClass(itemView.ItemContext, itemView.ItemRotation);
itemContext.GClass2813_0.OnDisposed += RugPull;
itemContext.OnDisposed += RugPull;
SelectedItemViews.Add(itemView, itemContext);
SortedItemContexts.Add(itemContext);
ShowSelection(itemView);
}
}
public static void Deselect(GridItemView itemView)
{
if (SelectedItemViews.Remove(itemView))
if (SelectedItemViews.TryGetValue(itemView, out ItemContextClass itemContext))
{
itemContext.GClass2813_0.OnDisposed -= RugPull;
itemContext.OnDisposed -= RugPull;
itemContext.Dispose();
SortedItemContexts.Remove(itemContext);
SelectedItemViews.Remove(itemView);
HideSelection(itemView);
}
}
public static IEnumerable<ItemView> ItemViews
public static bool IsSelected(GridItemView itemView)
{
get { return SelectedItemViews; }
return SelectedItemViews.ContainsKey(itemView);
}
public static IEnumerable<ItemContextClass> ItemContexts
{
get { return SelectedItemContexts; }
get { return SortedItemContexts; }
}
public static int Count
@@ -85,39 +97,11 @@ namespace UIFixes
get { return SelectedItemViews.Count; }
}
public static bool Contains(GridItemView itemView)
{
return SelectedItemViews.Contains(itemView);
}
public static bool Active
{
get { return SelectedItemViews.Count > 1; }
}
public static bool IsSelected(GridItemView itemView)
{
return SelectedItemViews.Contains(itemView);
}
public static void BeginDrag()
{
foreach (ItemView itemView in SelectedItemViews)
{
SelectedItemContexts.Add(new ItemContextClass(itemView.ItemContext, itemView.ItemRotation));
}
}
public static void EndDrag()
{
foreach(ItemContextClass itemContext in SelectedItemContexts)
{
itemContext.Dispose();
}
SelectedItemContexts.Clear();
}
public static void ShowDragCount(DraggedItemView draggedItemView)
{
if (Count > 1)
@@ -139,6 +123,11 @@ namespace UIFixes
}
}
private static void RugPull()
{
throw new InvalidOperationException("ItemContext disposed before MultiSelect was done with it!");
}
private static void ShowSelection(GridItemView itemView)
{
GameObject selectedMark = itemView.transform.Find("SelectedMark")?.gameObject;