Merge pull request #50 from Thundernerd/fix/remove_custom_line_drawing

Author: Thundernerd

Editor/Builders/ClassesItemBuilder.cs

@@ -56,7 +56,7 @@ private AdvancedDropdownItem GetOrCreateParentItem(Type type, AdvancedDropdownIt
             foreach (string split in splits)
             {
                 currentPath += split + '.';
-                
+
                 if (splitToItem.TryGetValue(currentPath, out AdvancedDropdownItem foundItem))
                 {
                     splitItem = foundItem;

Editor/Builders/SceneItemBuilder.cs

@@ -35,7 +35,7 @@ public AdvancedDropdownItem Build()
             AdvancedDropdownItem root = new AdvancedDropdownItemWrapper("Scene");
 
             GameObject[] rootGameObjects = scene.Value.GetRootGameObjects();
-            
+
             foreach (GameObject rootGameObject in rootGameObjects)
             {
                 CreateItemsRecursive(rootGameObject.transform, root);
@@ -52,12 +52,12 @@ private void CreateItemsRecursive(Transform transform, AdvancedDropdownItem pare
             };
 
             Component[] components = transform.GetComponents(interfaceType);
-            
+
             foreach (Component component in components)
             {
                 advancedDropdownItem.AddChild(new SceneDropdownItem(component));
             }
-            
+
             foreach (Transform child in transform)
             {
                 CreateItemsRecursive(child, advancedDropdownItem);

Editor/Drawers/CustomObjectDrawer.cs

@@ -21,7 +21,7 @@ public partial class CustomObjectDrawer
         public event ClickedDelegate Clicked;
         public event DeletePressedDelegate DeletePressed;
         public event PropertiesClickedDelegate PropertiesClicked;
-        
+
         public void OnGUI(Rect position, GUIContent label, GUIContent content, SerializedProperty property)
         {
             Rect positionWithoutThumb = new Rect(position);

Editor/Drawers/RawReferenceDrawer.Styles.cs

@@ -51,34 +51,19 @@ public void OnGUI(Rect position)
 
             if (rawReferenceValue == null)
                 return;
-            
-            DrawLine(position);
+
             DrawProperty(position);
-            
             previousPropertyPath = Property.propertyPath;
         }
 
         private void DrawProperty(Rect position)
         {
-            Rect objectDrawerRect = new Rect(position);
-            
-            EditorGUI.PropertyField(objectDrawerRect,
+            EditorGUI.PropertyField(position,
                 RawReferenceProperty,
                 GUIContent.none,
                 true);
         }
 
-        private void DrawLine(Rect position)
-        {
-            Rect line = new Rect(position)
-            {
-                width = 5,
-                yMin = position.yMin + EditorGUIUtility.singleLineHeight,
-                x = position.x + EditorGUI.indentLevel * 15 - 9
-            };
-            EditorGUI.DrawRect(line, Styles.LineColor);
-        }
-
         protected override void PingObject(SerializedProperty property)
         {
             // No support for pinging raw objects for now (I guess this would ping the MonoScript?)
@@ -89,7 +74,7 @@ protected override void OnPropertiesClicked(SerializedProperty property)
         {
             if (RawReferenceValue == null)
                 return;
-            
+
             Type type = RawReferenceValue.GetType();
             string typeName = type.Name;
 
@@ -108,12 +93,12 @@ protected override void OnPropertiesClicked(SerializedProperty property)
 
         private void AvoidDuplicateReferencesInArray()
         {
-            if (!ShouldCheckProperty()) 
+            if (!ShouldCheckProperty())
                 return;
 
             object currentReferenceValue = RawReferenceValue;
 
-            if (currentReferenceValue == null) 
+            if (currentReferenceValue == null)
                 return;
 
             if (previousReferenceValue == currentReferenceValue)
@@ -127,8 +112,8 @@ private void AvoidDuplicateReferencesInArray()
 
         private bool ShouldCheckProperty()
         {
-            return IsPropertyInArray(Property) && 
-                   previousPropertyPath != null && 
+            return IsPropertyInArray(Property) &&
+                   previousPropertyPath != null &&
                    previousPropertyPath != Property.propertyPath;
         }
 

Editor/Drawers/RawReferenceDrawer.Styles.cs.meta

@@ -2,9 +2,12 @@
 
 namespace TNRD.Items
 {
-    public class NoneDropdownItem  : AdvancedDropdownItem, IDropdownItem
+    public class NoneDropdownItem : AdvancedDropdownItem, IDropdownItem
     {
-        public NoneDropdownItem() : base("None") { }
+        public NoneDropdownItem()
+            : base("None")
+        {
+        }
 
         ReferenceMode IDropdownItem.Mode => ReferenceMode.Raw;
 

Editor/Drawers/RawReferenceDrawer.cs

@@ -1,3 +1,3 @@
 using System.Runtime.CompilerServices;
 
-[assembly:InternalsVisibleTo("TNRD.SerializableInterface.Editor")]
+[assembly: InternalsVisibleTo("TNRD.SerializableInterface.Editor")]

Editor/Items/NoneDropdownItem.cs

@@ -31,7 +31,7 @@ out TInterface value
             value = serializableInterface.Value;
             return true;
         }
-        
+
         /// <inheritdoc cref="IsDefined{TInterface}"/>
         public static bool TryGetValue<TInterface>(
             this SerializableInterface<TInterface> serializableInterface,