Add folder color picker dynamic icons

closed when unselected, open when selected

Author: xsduan

Editor/FolderEditor.cs

@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using UnityEditor;
 using UnityEditor.Experimental;
 using UnityEngine;
@@ -41,8 +41,8 @@ private void DoIconColorPicker()
                     int index = 1 + column + row * HierarchyFolderIcon.IconColumnCount;
                     float width = gridRect.width / HierarchyFolderIcon.IconColumnCount;
                     float height = gridRect.height / HierarchyFolderIcon.IconRowCount;
-                    Rect rect = new Rect(gridRect.x + width * column, gridRect.y + height * row, width, height);
-                    var (icon, _) = HierarchyFolderIcon.coloredFolderIcons[index];
+                    var rect = new Rect(gridRect.x + width * column, gridRect.y + height * row, width, height);
+                    var (openIcon, closeIcon) = HierarchyFolderIcon.ColoredFolderIcons(index);
 
                     if (Event.current.type == EventType.Repaint)
                     {
@@ -60,7 +60,7 @@ private void DoIconColorPicker()
                         }
                     }
 
-                    if (GUI.Button(rect, icon, EditorStyles.label))
+                    if (GUI.Button(rect, currentIndex == index ? openIcon : closeIcon, EditorStyles.label))
                     {
                         Undo.RecordObject(target, "Set Folder Color");
                         colorIndexProperty.intValue = currentIndex == index ? 0 : index;

Editor/HierarchyFolderIcon.cs

@@ -40,8 +40,8 @@ public class HierarchyFolderIcon
         private static MethodInfo meth_isExpanded;
         private static MethodInfo meth_getAllSceneHierarchyWindows;
 
-        private static (Texture2D, Texture2D)[] _coloredFolderIcons; 
-        public static (Texture2D, Texture2D)[] coloredFolderIcons => _coloredFolderIcons;
+        private static (Texture2D open, Texture2D closed)[] _coloredFolderIcons;
+        public static (Texture2D open, Texture2D closed) ColoredFolderIcons(int i) => _coloredFolderIcons[i];
 
         public static int IconColumnCount => IconColors.GetLength(0);
         public static int IconRowCount => IconColors.GetLength(1);
@@ -202,13 +202,10 @@ private static void RefreshFolderIcons(int instanceid, Rect selectionrect)
                     var itemObject = (Object) prop_objectPPTR.GetValue(item);
                     if (!Folder.TryGetIconIndex(itemObject, out int colorIndex)) { continue; }
 
-                    
                     var isExpanded = (bool) meth_isExpanded.Invoke(data, new object[] { item });
 
-                    Texture2D open, closed;
-                    var count = _coloredFolderIcons.Length;
-                    (open, closed) = coloredFolderIcons[Mathf.Clamp(colorIndex, 0, count) % count];
-                    item.icon = isExpanded ? open : closed;
+                    var icons = ColoredFolderIcons(Mathf.Clamp(colorIndex, 0, _coloredFolderIcons.Length - 1));
+                    item.icon = isExpanded ? icons.open : icons.closed;
 
                     prop_selectedIcon.SetValue(item, isExpanded ? openFolderSelectedTexture : closedFolderSelectedTexture);
                 }