com.soosvet_games.common_tools 1.0.9 → 1.1.0

package/Editor/HierarchyActivationTool.cs

@@ -6,32 +6,53 @@ namespace SoosvetGames.CommonTools.Extensions.Editor
     [ InitializeOnLoad ]
     internal static class HierarchyActivationTool
     {
-        static HierarchyActivationTool() => EditorApplication.hierarchyWindowItemOnGUI += HierarchWindowOnGui;
+        static HierarchyActivationTool()
+        {
+#if UNITY_6000_3_OR_NEWER
+            EditorApplication.hierarchyWindowItemByEntityIdOnGUI += HierarchyWindowOnGui;
+#else
+            EditorApplication.hierarchyWindowItemOnGUI += HierarchyWindowOnGui;
+#endif
+        }
+
+#if UNITY_6000_3_OR_NEWER
+
+        private static void HierarchyWindowOnGui(EntityId entityId, Rect selectionRect)
+        {
+            var obj = EditorUtility.EntityIdToObject(entityId) as GameObject;
 
-        private static void HierarchWindowOnGui( int instanceID, Rect selectionRect )
+            DrawToggle(obj, selectionRect);
+        }
+
+#else
+
+        private static void HierarchyWindowOnGui( int instanceId, Rect selectionRect )
         {
-            // make rectangle
-            var r = new Rect(selectionRect);
-            r.x = 35;
-            r.width = 18;
-
-            // get objects
-            Object o = EditorUtility.InstanceIDToObject(instanceID);
-            var obj = o as GameObject;
-
-            // drag toggle gui
-            if (obj != null)
-            {
-                bool prev = obj.activeSelf;
-                bool next = GUI.Toggle(r, obj.activeSelf, string.Empty);
-
-                if (next != prev)
-                {
-                    Undo.RecordObject(obj, $"Record {obj.name}");
-                    obj.SetActive(next);
-                    EditorUtility.SetDirty(obj);
-                }
-            }
+            var obj = EditorUtility.InstanceIDToObject( instanceId ) as GameObject;
+
+            DrawToggle( obj, selectionRect );
+        }
+
+#endif
+
+        private static void DrawToggle( GameObject obj, Rect selectionRect )
+        {
+            if ( obj == null )
+                return;
+
+            var rect = new Rect( selectionRect ) { x = 35, width = 18 };
+
+            bool previousValue = obj.activeSelf;
+            bool newValue = GUI.Toggle( rect, previousValue, string.Empty );
+
+            if ( newValue == previousValue )
+                return;
+
+            Undo.RecordObject( obj, $"Set Active {obj.name}" );
+
+            obj.SetActive( newValue );
+
+            EditorUtility.SetDirty( obj );
         }
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name" : "com.soosvet_games.common_tools",
     "displayName" : "Soosvet Games Common Tools",
-    "version" : "1.0.9",
+    "version" : "1.1.0",
     "author" : "Soosvet Games",
     "description" : "Common tools for Unity.",
     "repository": {