Merge remote-tracking branch 'upstream/main' into #25-Fix-Setter-ReferenceDrawer

Author: marc-antoine-girard

Editor/Drawers/CustomObjectDrawer.cs

@@ -94,6 +94,7 @@ private void HandleMouseDown(Rect position, Rect positionWithoutThumb)
             else if (Event.button == 1 && positionWithoutThumb.Contains(Event.mousePosition))
             {
                 GenericMenu menu = new GenericMenu();
+                menu.AddItem(new GUIContent("Clear"), false, () => { DeletePressed?.Invoke(); });
                 menu.AddItem(new GUIContent("Properties..."), false, () => { PropertiesClicked?.Invoke(); });
                 menu.DropDown(position);
                 Event.Use();

Editor/Drawers/RawReferenceDrawer.cs

@@ -48,6 +48,9 @@ public void OnGUI(Rect position)
                 : new GUIContent(rawReferenceValue.GetType().Name, IconUtility.ScriptIcon);
 
             CustomObjectDrawer.OnGUI(objectFieldRect, label, content);
+
+            HandleDragAndDrop(objectFieldRect);
+
             if (rawReferenceValue == null)
                 return;
 
@@ -59,8 +62,6 @@ public void OnGUI(Rect position)
                 new GUIContent(rawReferenceValue.GetType().Name),
                 true);
 
-            HandleDragAndDrop(objectFieldRect);
-
             previousPropertyPath = Property.propertyPath;
         }
 
@@ -72,6 +73,9 @@ protected override void PingObject()
         /// <inheritdoc />
         protected override void OnPropertiesClicked()
         {
+            if (RawReferenceValue == null)
+                return;
+            
             Type type = RawReferenceValue.GetType();
             string typeName = type.Name;
 

Editor/Drawers/ReferenceDrawer.cs

@@ -151,13 +151,17 @@ private void OnItemSelected(ReferenceMode mode, object reference)
 
         protected void HandleDragAndDrop(Rect position)
         {
+            if (!position.Contains(Event.current.mousePosition))
+                return;
+            
             if (Event.current.type == EventType.DragPerform)
             {
+                HandleDragUpdated();
                 HandleDragPerform();
             }
             else if (Event.current.type == EventType.DragUpdated)
             {
-                HandleDragUpdated(position);
+                HandleDragUpdated();
             }
         }
 
@@ -176,11 +180,8 @@ private void SetDragAndDropMode(bool success, DragAndDropMode? successMode = nul
             }
         }
 
-        private void HandleDragUpdated(Rect position)
+        private void HandleDragUpdated()
         {
-            if (!position.Contains(Event.current.mousePosition))
-                return;
-
             if (DragAndDrop.objectReferences.Length > 1)
             {
                 SetDragAndDropMode(false);

Editor/Items/NoneDropdownItem.cs

@@ -0,0 +1,16 @@
+using UnityEditor.IMGUI.Controls;
+
+namespace TNRD.Items
+{
+    public class NoneDropdownItem  : AdvancedDropdownItem, IDropdownItem
+    {
+        public NoneDropdownItem() : base("None") { }
+
+        ReferenceMode IDropdownItem.Mode => ReferenceMode.Raw;
+
+        public object GetValue()
+        {
+            return null;
+        }
+    }
+}

Editor/Items/NoneDropdownItem.cs.meta

@@ -48,6 +48,11 @@ protected override AdvancedDropdownItem BuildRoot()
                 .AddChild(new ClassesItemBuilder(interfaceType).Build())
                 .AddChild(new SceneItemBuilder(interfaceType, relevantScene).Build());
 
+            foreach (AdvancedDropdownItem dropdownItem in item.children)
+            {
+                dropdownItem.AddChild(new NoneDropdownItem());
+            }
+            
             if (canSort)
             {
                 sortChildrenMethod.Invoke(item,
@@ -62,6 +67,12 @@ protected override AdvancedDropdownItem BuildRoot()
 
         private int Sort(AdvancedDropdownItem a, AdvancedDropdownItem b)
         {
+            // For aesthetic reasons. Always puts the None first
+            if (a is NoneDropdownItem)
+                return -1;
+            if (b is NoneDropdownItem)
+                return 1;
+            
             int childrenA = a.children.Count();
             int childrenB = b.children.Count();