Merge 3e38388 into 8ffd29f

Author: joaompneves

CefSharp.Wpf/CefSharp.Wpf.csproj

@@ -79,6 +79,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CefSettings.cs" />
+    <Compile Include="DragCursorProvider.cs" />
     <Compile Include="Internals\MonitorInfo.cs" />
     <Compile Include="Internals\MonitorInfoEx.cs" />
     <Compile Include="Internals\RectStruct.cs" />

CefSharp.Wpf/ChromiumWebBrowser.cs

@@ -489,6 +489,7 @@ private void NoInliningConstructor()
             DragOver += OnDragOver;
             DragLeave += OnDragLeave;
             Drop += OnDrop;
+            GiveFeedback += OnGiveFeedback;
 
             IsVisibleChanged += OnIsVisibleChanged;
 
@@ -610,6 +611,7 @@ protected virtual void Dispose(bool isDisposing)
                     DragOver -= OnDragOver;
                     DragLeave -= OnDragLeave;
                     Drop -= OnDrop;
+                    GiveFeedback -= OnGiveFeedback;
 
                     IsVisibleChanged -= OnIsVisibleChanged;
 
@@ -787,7 +789,8 @@ void IRenderWebBrowser.UpdateDragCursor(DragOperationsMask operation)
         /// <param name="operation">describes the allowed operation (none, move, copy, link). </param>
         protected virtual void UpdateDragCursor(DragOperationsMask operation)
         {
-            //TODO: Someone should implement this
+            var dragCursor = DragCursorProvider.GetCursor(operation);
+            UiThreadRunAsync(() => Mouse.SetCursor(dragCursor));
         }
 
         /// <summary>
@@ -1531,6 +1534,16 @@ private void OnDragOver(object sender, DragEventArgs e)
             }
         }
 
+        /// <summary>
+        /// Handles the <see cref="E:GiveFeedback" /> event.
+        /// </summary>
+        /// <param name="sender">The sender.</param>
+        /// <param name="e">The <see cref="GiveFeedbackEventArgs"/> instance containing the event data.</param>
+        private void OnGiveFeedback(object sender, GiveFeedbackEventArgs e) {
+            /// prevent showing default cursor, the appropriate cursor will be set by <see cref=UpdateDragCursor />
+            e.Handled = true;
+        }
+
         /// <summary>
         /// Handles the <see cref="E:DragEnter" /> event.
         /// </summary>

CefSharp.Wpf/DragCursorProvider.cs

@@ -0,0 +1,60 @@
+// Copyright © 2019 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using System.Windows.Input;
+using System.Windows.Interop;
+using CefSharp.Enums;
+using Microsoft.Win32.SafeHandles;
+
+namespace CefSharp.Wpf 
+{
+
+    internal static class DragCursorProvider 
+    {
+        [DllImport("kernel32.dll")]
+        private static extern IntPtr LoadLibrary(string dllToLoad);
+
+        [DllImport("user32.dll")]
+        private static extern IntPtr LoadCursor(IntPtr hInstance, ushort lpCursorName);
+        
+        private static readonly Dictionary<DragOperationsMask, Cursor> DragCursors;
+
+        static DragCursorProvider() 
+        {
+            var library = LoadLibrary("ole32.dll");
+            DragCursors = new Dictionary<DragOperationsMask, Cursor>()
+            {
+                { DragOperationsMask.None, GetCursorFromLib(library, 1) },
+                { DragOperationsMask.Move, GetCursorFromLib(library, 2) },
+                { DragOperationsMask.Copy, GetCursorFromLib(library, 3) },
+                { DragOperationsMask.Link, GetCursorFromLib(library, 4) }
+                // TODO: support black cursors
+            };
+        }
+
+        private static Cursor GetCursorFromLib(IntPtr library, ushort cursorIndex) 
+        {
+            var cursorHandle = LoadCursor(library, cursorIndex);
+            return CursorInteropHelper.Create(new SafeFileHandle(cursorHandle, false));
+        }
+
+        /// <summary>
+        /// Get the Windows cursor for the drag effect specified.
+        /// </summary>
+        /// <param name="operation"></param>
+        /// <returns>The drop cursor based on the specified drag operation effect</returns>
+        public static Cursor GetCursor(DragOperationsMask operation) 
+        {
+            Cursor cursor;
+            if (DragCursors.TryGetValue(operation, out cursor)) 
+            {
+                return cursor;
+            }
+            return Cursors.Arrow;
+        }
+    }
+}