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

Revert "fix: vfolders for unity 6.2" 

This reverts commit e35f5e0261.
This commit is contained in:
hypercross 2025-09-06 19:42:18 +08:00
parent e35f5e0261
commit 4bd75f2868
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vfolders2/vFolders/VFolders.cs
View File

@ -97,7 +97,7 @@ namespace VFolders
var maxScrollPos = 20; var maxScrollPos = 20;
var scrollPos = window.GetMemberValue(isOneColumn ? "m_AssetTree" : "m_FolderTree").GetMemberValue<UnityEditor.IMGUI.Controls.TreeViewState<int>>("state").scrollPos.y; var scrollPos = window.GetMemberValue(isOneColumn ? "m_AssetTree" : "m_FolderTree").GetMemberValue<UnityEditor.IMGUI.Controls.TreeViewState>("state").scrollPos.y;
var opacity = ((scrollPos - minScrollPos) / (maxScrollPos - minScrollPos)).Clamp01(); var opacity = ((scrollPos - minScrollPos) / (maxScrollPos - minScrollPos)).Clamp01();
@ -886,7 +886,7 @@ namespace VFolders
} }
public static TreeViewItem<int> lastHoveredTreeItem; public static TreeViewItem lastHoveredTreeItem;
public static Rect lastHoveredRowRect_screenSpace; public static Rect lastHoveredRowRect_screenSpace;

16
vfolders2/vFolders/VFoldersController.cs
View File

@ -148,7 +148,7 @@ namespace VFolders
var treeViewState = treeViewController?.GetPropertyValue<TreeViewState<int>>("state"); var treeViewState = treeViewController?.GetPropertyValue<TreeViewState>("state");
currentScrollPos = treeViewState?.scrollPos.y ?? 0; currentScrollPos = treeViewState?.scrollPos.y ?? 0;
@ -197,7 +197,7 @@ namespace VFolders
public void ToggleExpanded(TreeViewItem<int> item) public void ToggleExpanded(TreeViewItem item)
{ {
SetExpanded_withAnimation(item.id, !expandedIds.Contains(item.id)); SetExpanded_withAnimation(item.id, !expandedIds.Contains(item.id));
@ -233,12 +233,12 @@ namespace VFolders
} }
public void Isolate(TreeViewItem<int> targetItem) public void Isolate(TreeViewItem targetItem)
{ {
List<TreeViewItem<int>> getParents(TreeViewItem<int> item) List<TreeViewItem> getParents(TreeViewItem item)
{ {
var parents = new List<TreeViewItem<int>>(); var parents = new List<TreeViewItem>();
while (item.parent != null) while (item.parent != null)
parents.Add(item = item.parent); parents.Add(item = item.parent);
@ -251,11 +251,11 @@ namespace VFolders
var expandedVisibleItems = new List<TreeViewItem<int>>(); var expandedVisibleItems = new List<TreeViewItem>();
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<int>>("GetItem", rowIndex)); expandedVisibleItems.Add(treeViewControllerData.InvokeMethod<TreeViewItem>("GetItem", rowIndex));
@ -391,7 +391,7 @@ namespace VFolders
public void SetScrollPos(float targetScrollPos) public void SetScrollPos(float targetScrollPos)
{ {
treeViewController.GetPropertyValue<TreeViewState<int>>("state").scrollPos = Vector2.up * targetScrollPos; treeViewController.GetPropertyValue<TreeViewState>("state").scrollPos = Vector2.up * targetScrollPos;
} }

14
vfolders2/vFolders/VFoldersGUI.cs
View File

@ -50,7 +50,7 @@ namespace VFolders
TreeViewItem<int> treeItem = null; TreeViewItem treeItem = null;
var isRowSelected = false; var isRowSelected = false;
var isRowBeingRenamed = false; var isRowBeingRenamed = false;
@ -88,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<int>>("FindItem", instanceId); treeItem = treeViewController?.InvokeMethod<TreeViewItem>("FindItem", instanceId);
} }
@ -407,8 +407,8 @@ namespace VFolders
var depth = ((rowRect.x - 16) / 14).RoundToInt(); var depth = ((rowRect.x - 16) / 14).RoundToInt();
bool isLastChild(TreeViewItem<int> item) => item.parent?.children?.LastOrDefault() == item; bool isLastChild(TreeViewItem item) => item.parent?.children?.LastOrDefault() == item;
bool hasChilren(TreeViewItem<int> item) => item.children != null && item.children.Count > 0; bool hasChilren(TreeViewItem item) => item.children != null && item.children.Count > 0;
void calcVerticalGaps_beforeFirstRowDrawn() void calcVerticalGaps_beforeFirstRowDrawn()
{ {
@ -1123,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<int>>>("GetRows"); rows = treeViewControllerData?.InvokeMethod<IList<TreeViewItem>>("GetRows");
var treeViewState = treeViewController?.GetPropertyValue<TreeViewState<int>>("state"); var treeViewState = treeViewController?.GetPropertyValue<TreeViewState>("state");
expandedIds = treeViewState?.expandedIDs ?? new List<int>(); expandedIds = treeViewState?.expandedIDs ?? new List<int>();
@ -1177,7 +1177,7 @@ namespace VFolders
public object treeViewController; public object treeViewController;
public object treeViewControllerData; public object treeViewControllerData;
public IList<TreeViewItem<int>> rows; public IList<TreeViewItem> rows;
public List<int> expandedIds = new(); public List<int> expandedIds = new();

2
vfolders2/vFolders/VFoldersHistory.cs
View File

@ -216,7 +216,7 @@ namespace VFolders
var treeViewControllerState = treeViewController?.GetPropertyValue<TreeViewState<int>>("state"); var treeViewControllerState = treeViewController?.GetPropertyValue<TreeViewState>("state");
currentScrollPos = treeViewControllerState?.scrollPos.y ?? 0; currentScrollPos = treeViewControllerState?.scrollPos.y ?? 0;