Merge pull request #127 from 5unad0ke1/main

Hierarchy Rendering Fix: Resolve Prefab Active Toggle / Expand Button Overlap

Author: nuskey8

Alchemy/Assets/Alchemy/Editor/Hierarchy/HierarchyToggleDrawer.cs

@@ -21,6 +21,9 @@ public override void OnGUI(int instanceID, Rect selectionRect)
                 rect.x = rect.xMax - 2.7f;
                 rect.width = 16f;
 
+                if (IsNewPrefabWorkflow() && IsPrefab(gameObject))
+                    rect.x -= 16.7f;
+
                 var active = GUI.Toggle(rect, gameObject.activeSelf, string.Empty);
                 if (active != gameObject.activeSelf)
                 {
@@ -34,6 +37,10 @@ public override void OnGUI(int instanceID, Rect selectionRect)
             {
                 var rect = selectionRect;
                 rect.x = rect.xMax - (settings.ShowHierarchyToggles ? 18.7f : 2.7f);
+
+                if (IsNewPrefabWorkflow() && IsPrefab(gameObject))
+                    rect.x -= 16.7f;
+
                 rect.y += 1f;
                 rect.width = 14f;
                 rect.height = 14f;
@@ -76,6 +83,21 @@ static bool IsEnabled(Component component)
             var property = component.GetType().GetProperty("enabled", typeof(bool));
             return (bool)(property?.GetValue(component, null) ?? true);
         }
+        private static bool IsPrefab(GameObject gameObj)
+        {
+            if (gameObj == null)
+                return false;
+            var prefabType = PrefabUtility.GetPrefabAssetType(gameObj);
+            return prefabType != PrefabAssetType.NotAPrefab;
+        }
+        private static bool IsNewPrefabWorkflow()
+        {
+#if UNITY_2018_3_OR_NEWER
+            return true;
+#else
+            return false;
+#endif
+        }
     }
 
 }