renamed DragOperation to DragDropEffects

src/Avalonia.Controls/DragDrop/DefaultDragDispatcher.cs

@@ -23,37 +23,37 @@ namespace Avalonia.Controls.DragDrop
             return null;
         }
         
-        private DragOperation RaiseDragEvent(Interactive target, RoutedEvent<DragEventArgs> routedEvent, DragOperation operation, IDragData data)
+        private DragDropEffects RaiseDragEvent(Interactive target, RoutedEvent<DragEventArgs> routedEvent, DragDropEffects operation, IDragData data)
         {
             if (target == null)
-                return DragOperation.None;
+                return DragDropEffects.None;
             var args = new DragEventArgs(routedEvent, data)
             {
                 RoutedEvent = routedEvent,
-                DragOperation = operation
+                DragEffects = operation
             };
             target.RaiseEvent(args);
-            return args.DragOperation;
+            return args.DragEffects;
         }
         
-        public DragOperation DragEnter(IInputElement inputRoot, Point point, IDragData data, DragOperation operation)
+        public DragDropEffects DragEnter(IInputElement inputRoot, Point point, IDragData data, DragDropEffects effects)
         {
             _lastTarget = GetTarget(inputRoot, point);
-            return RaiseDragEvent(_lastTarget, DragDrop.DragEnterEvent, operation, data);
+            return RaiseDragEvent(_lastTarget, DragDrop.DragEnterEvent, effects, data);
         }
 
-        public DragOperation DragOver(IInputElement inputRoot, Point point, IDragData data, DragOperation operation)
+        public DragDropEffects DragOver(IInputElement inputRoot, Point point, IDragData data, DragDropEffects effects)
         {
             var target = GetTarget(inputRoot, point);
 
             if (target == _lastTarget)
-                return RaiseDragEvent(target, DragDrop.DragOverEvent, operation, data);
+                return RaiseDragEvent(target, DragDrop.DragOverEvent, effects, data);
             
             try
             {
                 if (_lastTarget != null)
                     _lastTarget.RaiseEvent(new RoutedEventArgs(DragDrop.DragLeaveEvent));
-                return RaiseDragEvent(target, DragDrop.DragEnterEvent, operation, data);
+                return RaiseDragEvent(target, DragDrop.DragEnterEvent, effects, data);
             }
             finally
             {
@@ -75,11 +75,11 @@ namespace Avalonia.Controls.DragDrop
             }
         }
 
-        public DragOperation Drop(IInputElement inputRoot, Point point, IDragData data, DragOperation operation)
+        public DragDropEffects Drop(IInputElement inputRoot, Point point, IDragData data, DragDropEffects effects)
         {
             try
             {
-                return RaiseDragEvent(_lastTarget, DragDrop.DropEvent, operation, data);
+                return RaiseDragEvent(_lastTarget, DragDrop.DropEvent, effects, data);
             }
             finally 
             {

src/Avalonia.Controls/DragDrop/DragOperation.cs → src/Avalonia.Controls/DragDrop/DragDropEffects.cs

@@ -3,7 +3,7 @@
 namespace Avalonia.Controls.DragDrop
 {
     [Flags]
-    public enum DragOperation
+    public enum DragDropEffects
     {
         None = 0,
         Copy = 1,

src/Avalonia.Controls/DragDrop/DragEventArgs.cs

@@ -4,7 +4,7 @@ namespace Avalonia.Controls.DragDrop
 {
     public class DragEventArgs : RoutedEventArgs
     {
-        public DragOperation DragOperation { get; set; }
+        public DragDropEffects DragEffects { get; set; }
 
         public IDragData Data { get; private set; }
 

src/Avalonia.Controls/DragDrop/IDragDispatcher.cs

@@ -7,9 +7,9 @@ namespace Avalonia.Controls.DragDrop
     /// </summary>
     public interface IDragDispatcher
     {
-        DragOperation DragEnter(IInputElement inputRoot, Point point, IDragData data, DragOperation operation);
-        DragOperation DragOver(IInputElement inputRoot, Point point, IDragData data, DragOperation operation);
+        DragDropEffects DragEnter(IInputElement inputRoot, Point point, IDragData data, DragDropEffects effects);
+        DragDropEffects DragOver(IInputElement inputRoot, Point point, IDragData data, DragDropEffects effects);
         void DragLeave(IInputElement inputRoot);
-        DragOperation Drop(IInputElement inputRoot, Point point, IDragData data, DragOperation operation);
+        DragDropEffects Drop(IInputElement inputRoot, Point point, IDragData data, DragDropEffects effects);
     }
 }

src/OSX/Avalonia.MonoMac/DraggingInfo.cs

@@ -17,27 +17,27 @@ namespace Avalonia.MonoMac
         }
 
 
-        internal static NSDragOperation ConvertDragOperation(DragOperation d)
+        internal static NSDragOperation ConvertDragOperation(DragDropEffects d)
         {
             NSDragOperation result = NSDragOperation.None;
-            if (d.HasFlag(DragOperation.Copy))
+            if (d.HasFlag(DragDropEffects.Copy))
                 result |= NSDragOperation.Copy;
-            if (d.HasFlag(DragOperation.Link))
+            if (d.HasFlag(DragDropEffects.Link))
                 result |= NSDragOperation.Link;
-            if (d.HasFlag(DragOperation.Move))
+            if (d.HasFlag(DragDropEffects.Move))
                 result |= NSDragOperation.Move;
             return result;
         }
         
-        internal static DragOperation ConvertDragOperation(NSDragOperation d)
+        internal static DragDropEffects ConvertDragOperation(NSDragOperation d)
         {
-            DragOperation result = DragOperation.None;
+            DragDropEffects result = DragDropEffects.None;
             if (d.HasFlag(NSDragOperation.Copy))
-                result |= DragOperation.Copy;
+                result |= DragDropEffects.Copy;
             if (d.HasFlag(NSDragOperation.Link))
-                result |= DragOperation.Link;
+                result |= DragDropEffects.Link;
             if (d.HasFlag(NSDragOperation.Move))
-                result |= DragOperation.Move;
+                result |= DragDropEffects.Move;
             return result;
         }
 

src/OSX/Avalonia.MonoMac/TopLevelImpl.cs

@@ -201,7 +201,7 @@ namespace Avalonia.MonoMac
                 
                 dragOp = _dragDispatcher.DragOver(root, pt, info, dragOp);
                 
-                return dragOp != DragOperation.None;
+                return dragOp != DragDropEffects.None;
             }
 
             public override bool PerformDragOperation(NSDraggingInfo sender)
@@ -216,7 +216,7 @@ namespace Avalonia.MonoMac
                 
                 dragOp = _dragDispatcher.Drop(root, pt, info, dragOp);
                 
-                return dragOp != DragOperation.None;
+                return dragOp != DragDropEffects.None;
             }
             
 

src/Windows/Avalonia.Win32/OleDropTarget.cs

@@ -22,27 +22,27 @@ namespace Avalonia.Win32
             _target = target;
         }
 
-        static DropEffect ConvertDropEffect(DragOperation operation)
+        static DropEffect ConvertDropEffect(DragDropEffects operation)
         {
             DropEffect result = DropEffect.None;
-            if (operation.HasFlag(DragOperation.Copy))
+            if (operation.HasFlag(DragDropEffects.Copy))
                 result |= DropEffect.Copy;
-            if (operation.HasFlag(DragOperation.Move))
+            if (operation.HasFlag(DragDropEffects.Move))
                 result |= DropEffect.Move;
-            if (operation.HasFlag(DragOperation.Link))
+            if (operation.HasFlag(DragDropEffects.Link))
                 result |= DropEffect.Link;
             return result;
         }
 
-        static DragOperation ConvertDropEffect(DropEffect effect)
+        static DragDropEffects ConvertDropEffect(DropEffect effect)
         {
-            DragOperation result = DragOperation.None;
+            DragDropEffects result = DragDropEffects.None;
             if (effect.HasFlag(DropEffect.Copy))
-                result |= DragOperation.Copy;
+                result |= DragDropEffects.Copy;
             if (effect.HasFlag(DropEffect.Move))
-                result |= DragOperation.Move;
+                result |= DragDropEffects.Move;
             if (effect.HasFlag(DropEffect.Link))
-                result |= DragOperation.Link;
+                result |= DragDropEffects.Link;
             return result;
         }