Merge pull request #191 from Unity-Technologies/fixes-for-blackboard

Fixes for blackboard

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Blackboard/BlackboardField.cs

             activeFieldInfo.SetValue(m_SelectionDropper, false);
             this.AddManipulator(m_SelectionDropper);
 
-            var contextualMenuManipulator = (IManipulator)Activator.CreateInstance(s_ContextualMenuManipulator, (Action<ContextualMenuPopulateEvent>)BuildContextualMenu);
-            this.AddManipulator(contextualMenuManipulator);
+            this.AddManipulator((IManipulator)Activator.CreateInstance(s_ContextualMenuManipulator, (Action<ContextualMenuPopulateEvent>)BuildContextualMenu));
         }
 
         void BuildContextualMenu(ContextualMenuPopulateEvent evt)

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Blackboard/BlackboardProvider.cs

                 moveItemRequested = MoveItemRequested
             };
 
-            m_WindowDraggable = new WindowDraggable();
+            m_WindowDraggable = new WindowDraggable(blackboard.shadow.Children().First().Q("header"));
             blackboard.AddManipulator(m_WindowDraggable);
 
             m_ResizeBorderFrame = new ResizeBorderFrame(blackboard) { name = "resizeBorderFrame" };
             var property = visualElement.userData as IShaderProperty;
             if (property == null)
                 return;
+            m_Graph.owner.RegisterCompleteObjectUndo("Move Property");
             m_Graph.MoveShaderProperty(property, newIndex);
         }
 
             var property = (IShaderProperty)field.userData;
             if (newText != property.displayName)
             {
+                m_Graph.owner.RegisterCompleteObjectUndo("Edit Property Name");
                 property.displayName = newText;
                 field.text = newText;
                 DirtyNodes();
             {
                 field.RenameGo();
                 row.expanded = true;
+                m_Graph.owner.RegisterCompleteObjectUndo("Create Property");
                 m_Graph.AddShaderProperty(property);
             }
         }

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Manipulators/WindowDraggable.cs

-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
         Vector2 m_LocalMosueOffset;
         Rect m_PreviousParentRect;
 
+        VisualElement m_Handle;
+
-        public WindowDraggable(bool resizeWithParentwindow = false)
+        public WindowDraggable(VisualElement handle = null, bool resizeWithParentwindow = false)
+            m_Handle = handle;
             m_ResizeWithParentWindow = resizeWithParentwindow;
             m_Active = false;
             m_PreviousParentRect = new Rect(0f, 0f, 0f, 0f);
         {
-            target.RegisterCallback(new EventCallback<MouseDownEvent>(OnMouseDown), Capture.NoCapture);
-            target.RegisterCallback(new EventCallback<MouseMoveEvent>(OnMouseMove), Capture.NoCapture);
-            target.RegisterCallback(new EventCallback<MouseUpEvent>(OnMouseUp), Capture.NoCapture);
+            if (m_Handle == null)
+                m_Handle = target;
+            m_Handle.RegisterCallback(new EventCallback<MouseDownEvent>(OnMouseDown), Capture.NoCapture);
+            m_Handle.RegisterCallback(new EventCallback<MouseMoveEvent>(OnMouseMove), Capture.NoCapture);
+            m_Handle.RegisterCallback(new EventCallback<MouseUpEvent>(OnMouseUp), Capture.NoCapture);
-            target.UnregisterCallback(new EventCallback<MouseDownEvent>(OnMouseDown), Capture.NoCapture);
-            target.UnregisterCallback(new EventCallback<MouseMoveEvent>(OnMouseMove), Capture.NoCapture);
-            target.UnregisterCallback(new EventCallback<MouseUpEvent>(OnMouseUp), Capture.NoCapture);
+            m_Handle.UnregisterCallback(new EventCallback<MouseDownEvent>(OnMouseDown), Capture.NoCapture);
+            m_Handle.UnregisterCallback(new EventCallback<MouseMoveEvent>(OnMouseMove), Capture.NoCapture);
+            m_Handle.UnregisterCallback(new EventCallback<MouseUpEvent>(OnMouseUp), Capture.NoCapture);
-            m_LocalMosueOffset = target.WorldToLocal(evt.mousePosition);
+            m_LocalMosueOffset = m_Handle.WorldToLocal(evt.mousePosition);
-            target.TakeMouseCapture();
-            evt.StopPropagation();
+            m_Handle.TakeMouseCapture();
+            evt.StopImmediatePropagation();
         }
 
         void OnMouseMove(MouseMoveEvent evt)
 
             m_Active = false;
 
-            if (target.HasMouseCapture())
+            if (m_Handle.HasMouseCapture())
-                target.ReleaseMouseCapture();
+                m_Handle.ReleaseMouseCapture();
-            evt.StopPropagation();
+            evt.StopImmediatePropagation();
 
             RefreshDocking();