hypercross
/
unity-vendor-packages
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: hypercross:7ec5a903c5edb578bd46e054813070f74169784d
Branches Tags
hypercross:master
..
compare: hypercross:e35f5e02618a88e37069f0d71df7e9eeddd079f8
Branches Tags
hypercross:master

No commits in common. "7ec5a903c5edb578bd46e054813070f74169784d" and "e35f5e02618a88e37069f0d71df7e9eeddd079f8" have entirely different histories.
7ec5a903c5 ... e35f5e0261

4 changed files with 19 additions and 34 deletions
Show Stats Expand all files Collapse all files

8
vfolders2/vFolders/VFolders.cs
View File

@ -18,10 +18,6 @@ using static VFolders.Libs.VGUI;
using static VFolders.VFoldersData; using static VFolders.VFoldersData;
using static VFolders.VFoldersCache; using static VFolders.VFoldersCache;
#if UNITY_6000_2_OR_NEWER
using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
using TreeViewState = UnityEditor.IMGUI.Controls.TreeViewState<int>;
#endif
namespace VFolders namespace VFolders
@ -101,7 +97,7 @@ namespace VFolders
var maxScrollPos = 20; var maxScrollPos = 20;
var scrollPos = window.GetMemberValue(isOneColumn ? "m_AssetTree" : "m_FolderTree").GetMemberValue<TreeViewState>("state").scrollPos.y; var scrollPos = window.GetMemberValue(isOneColumn ? "m_AssetTree" : "m_FolderTree").GetMemberValue<UnityEditor.IMGUI.Controls.TreeViewState<int>>("state").scrollPos.y;
var opacity = ((scrollPos - minScrollPos) / (maxScrollPos - minScrollPos)).Clamp01(); var opacity = ((scrollPos - minScrollPos) / (maxScrollPos - minScrollPos)).Clamp01();
@ -890,7 +886,7 @@ namespace VFolders
} }
public static TreeViewItem lastHoveredTreeItem; public static TreeViewItem<int> lastHoveredTreeItem;
public static Rect lastHoveredRowRect_screenSpace; public static Rect lastHoveredRowRect_screenSpace;

20
vfolders2/vFolders/VFoldersController.cs
View File

@ -19,10 +19,6 @@ using static VFolders.VFolders;
using static VFolders.VFoldersData; using static VFolders.VFoldersData;
using static VFolders.VFoldersCache; using static VFolders.VFoldersCache;
#if UNITY_6000_2_OR_NEWER
using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
using TreeViewState = UnityEditor.IMGUI.Controls.TreeViewState<int>;
#endif
namespace VFolders namespace VFolders
@ -152,7 +148,7 @@ namespace VFolders
var treeViewState = treeViewController?.GetPropertyValue<TreeViewState>("state"); var treeViewState = treeViewController?.GetPropertyValue<TreeViewState<int>>("state");
currentScrollPos = treeViewState?.scrollPos.y ?? 0; currentScrollPos = treeViewState?.scrollPos.y ?? 0;
@ -201,7 +197,7 @@ namespace VFolders
public void ToggleExpanded(TreeViewItem item) public void ToggleExpanded(TreeViewItem<int> item)
{ {
SetExpanded_withAnimation(item.id, !expandedIds.Contains(item.id)); SetExpanded_withAnimation(item.id, !expandedIds.Contains(item.id));
@ -237,12 +233,12 @@ namespace VFolders
} }
public void Isolate(TreeViewItem targetItem) public void Isolate(TreeViewItem<int> targetItem)
{ {
List<TreeViewItem> getParents(TreeViewItem item) List<TreeViewItem<int>> getParents(TreeViewItem<int> item)
{ {
var parents = new List<TreeViewItem>(); var parents = new List<TreeViewItem<int>>();
while (item.parent != null) while (item.parent != null)
parents.Add(item = item.parent); parents.Add(item = item.parent);
@ -255,11 +251,11 @@ namespace VFolders
var expandedVisibleItems = new List<TreeViewItem>(); var expandedVisibleItems = new List<TreeViewItem<int>>();
foreach (var expandedId in expandedIds) foreach (var expandedId in expandedIds)
if (GetRowIndex(expandedId) is int rowIndex && rowIndex != -1) if (GetRowIndex(expandedId) is int rowIndex && rowIndex != -1)
expandedVisibleItems.Add(treeViewControllerData.InvokeMethod<TreeViewItem>("GetItem", rowIndex)); expandedVisibleItems.Add(treeViewControllerData.InvokeMethod<TreeViewItem<int>>("GetItem", rowIndex));
@ -395,7 +391,7 @@ namespace VFolders
public void SetScrollPos(float targetScrollPos) public void SetScrollPos(float targetScrollPos)
{ {
treeViewController.GetPropertyValue<TreeViewState>("state").scrollPos = Vector2.up * targetScrollPos; treeViewController.GetPropertyValue<TreeViewState<int>>("state").scrollPos = Vector2.up * targetScrollPos;
} }

19
vfolders2/vFolders/VFoldersGUI.cs
View File

@ -19,10 +19,7 @@ using static VFolders.VFolders;
using static VFolders.VFoldersData; using static VFolders.VFoldersData;
using static VFolders.VFoldersCache; using static VFolders.VFoldersCache;
#if UNITY_6000_2_OR_NEWER
using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
using TreeViewState = UnityEditor.IMGUI.Controls.TreeViewState<int>;
#endif
namespace VFolders namespace VFolders
{ {
@ -53,7 +50,7 @@ namespace VFolders
TreeViewItem treeItem = null; TreeViewItem<int> treeItem = null;
var isRowSelected = false; var isRowSelected = false;
var isRowBeingRenamed = false; var isRowBeingRenamed = false;
@ -91,7 +88,7 @@ namespace VFolders
if (treeItem != null) return; if (treeItem != null) return;
if (isFavorite || isFavoritesRoot) return; if (isFavorite || isFavoritesRoot) return;
treeItem = treeViewController?.InvokeMethod<TreeViewItem>("FindItem", instanceId); treeItem = treeViewController?.InvokeMethod<TreeViewItem<int>>("FindItem", instanceId);
} }
@ -410,8 +407,8 @@ namespace VFolders
var depth = ((rowRect.x - 16) / 14).RoundToInt(); var depth = ((rowRect.x - 16) / 14).RoundToInt();
bool isLastChild(TreeViewItem item) => item.parent?.children?.LastOrDefault() == item; bool isLastChild(TreeViewItem<int> item) => item.parent?.children?.LastOrDefault() == item;
bool hasChilren(TreeViewItem item) => item.children != null && item.children.Count > 0; bool hasChilren(TreeViewItem<int> item) => item.children != null && item.children.Count > 0;
void calcVerticalGaps_beforeFirstRowDrawn() void calcVerticalGaps_beforeFirstRowDrawn()
{ {
@ -1126,10 +1123,10 @@ namespace VFolders
treeViewController = window.GetFieldValue(isTwoColumns ? "m_FolderTree" : "m_AssetTree"); treeViewController = window.GetFieldValue(isTwoColumns ? "m_FolderTree" : "m_AssetTree");
treeViewControllerData = treeViewController?.GetPropertyValue("data"); treeViewControllerData = treeViewController?.GetPropertyValue("data");
rows = treeViewControllerData?.InvokeMethod<IList<TreeViewItem>>("GetRows"); rows = treeViewControllerData?.InvokeMethod<IList<TreeViewItem<int>>>("GetRows");
var treeViewState = treeViewController?.GetPropertyValue<TreeViewState>("state"); var treeViewState = treeViewController?.GetPropertyValue<TreeViewState<int>>("state");
expandedIds = treeViewState?.expandedIDs ?? new List<int>(); expandedIds = treeViewState?.expandedIDs ?? new List<int>();
@ -1180,7 +1177,7 @@ namespace VFolders
public object treeViewController; public object treeViewController;
public object treeViewControllerData; public object treeViewControllerData;
public IList<TreeViewItem> rows; public IList<TreeViewItem<int>> rows;
public List<int> expandedIds = new(); public List<int> expandedIds = new();

6
vfolders2/vFolders/VFoldersHistory.cs
View File

@ -20,10 +20,6 @@ using static VFolders.VFoldersData;
using static VFolders.VFoldersCache; using static VFolders.VFoldersCache;
#if UNITY_6000_2_OR_NEWER
using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
using TreeViewState = UnityEditor.IMGUI.Controls.TreeViewState<int>;
#endif
namespace VFolders namespace VFolders
{ {
@ -220,7 +216,7 @@ namespace VFolders
var treeViewControllerState = treeViewController?.GetPropertyValue<TreeViewState>("state"); var treeViewControllerState = treeViewController?.GetPropertyValue<TreeViewState<int>>("state");
currentScrollPos = treeViewControllerState?.scrollPos.y ?? 0; currentScrollPos = treeViewControllerState?.scrollPos.y ?? 0;