Index: Core/Common/src/Core.Common.Controls.TreeView/DragDropHandler.cs
===================================================================
diff -u -re2e9b8f56864fad784b080c62dfb0145e0c0d4b3 -ra1de055e3698f610875e623d39f4526970568cef
--- Core/Common/src/Core.Common.Controls.TreeView/DragDropHandler.cs (.../DragDropHandler.cs) (revision e2e9b8f56864fad784b080c62dfb0145e0c0d4b3)
+++ Core/Common/src/Core.Common.Controls.TreeView/DragDropHandler.cs (.../DragDropHandler.cs) (revision a1de055e3698f610875e623d39f4526970568cef)
@@ -151,13 +151,8 @@
var treeNodeInfo = getTreeNodeInfoForData(sourceNode.Tag);
var parentTag = sourceNode.Parent != null ? sourceNode.Parent.Tag : null;
- DragOperations dragOperation = treeNodeInfo.CanDrag != null
- ? treeNodeInfo.CanDrag(sourceNode.Tag, parentTag)
- : DragOperations.None;
-
- DragDropEffects effects = ToDragDropEffects(dragOperation);
-
- if (effects == DragDropEffects.None)
+ var canDrag = treeNodeInfo.CanDrag != null && treeNodeInfo.CanDrag(sourceNode.Tag, parentTag);
+ if (!canDrag)
{
return;
}
@@ -172,7 +167,7 @@
dataObject.SetData(sourceNode.Tag.GetType(), sourceNode.Tag);
}
- treeView.DoDragDrop(dataObject, effects);
+ treeView.DoDragDrop(dataObject, DragDropEffects.Move);
}
public void HandleDragLeave(FormsTreeView treeView)
Index: Core/Common/src/Core.Common.Controls.TreeView/TreeNodeInfo.cs
===================================================================
diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -ra1de055e3698f610875e623d39f4526970568cef
--- Core/Common/src/Core.Common.Controls.TreeView/TreeNodeInfo.cs (.../TreeNodeInfo.cs) (revision 4512af7782ee31b36941bb280b54d9da2953dd71)
+++ Core/Common/src/Core.Common.Controls.TreeView/TreeNodeInfo.cs (.../TreeNodeInfo.cs) (revision a1de055e3698f610875e623d39f4526970568cef)
@@ -133,7 +133,7 @@
/// The first object parameter represents the data of the tree node.
/// The second object parameter represents the data of the parent tree node.
///
- public Func