Merge pull request #1044 from cuddlyogre/cursor-type

SetCursor CefCursorType parameter

Author: amaitland

CefSharp.Core/Internals/RenderClientAdapter.h

@@ -174,7 +174,7 @@ namespace CefSharp
             virtual DECL void OnCursorChange(CefRefPtr<CefBrowser> browser, CefCursorHandle cursor, CursorType type,
                 const CefCursorInfo& custom_cursor_info) OVERRIDE
             {
-                _renderWebBrowser->SetCursor((IntPtr)cursor);
+                _renderWebBrowser->SetCursor((IntPtr)cursor, (CefSharp::CefCursorType)type);
             };
 
         private:

CefSharp.OffScreen/ChromiumWebBrowser.cs

@@ -422,7 +422,7 @@ void IRenderWebBrowser.InvokeRenderAsync(BitmapInfo bitmapInfo)
             }
         }
 
-        void IRenderWebBrowser.SetCursor(IntPtr cursor)
+        void IRenderWebBrowser.SetCursor(IntPtr handle, CefCursorType type)
         {
         }
 

CefSharp.Wpf/ChromiumWebBrowser.cs

@@ -295,7 +295,7 @@ void IRenderWebBrowser.SetPopupIsOpen(bool isOpen)
             UiThreadRunAsync(() => { popup.IsOpen = isOpen; });
         }
 
-        void IRenderWebBrowser.SetCursor(IntPtr handle)
+        void IRenderWebBrowser.SetCursor(IntPtr handle, CefCursorType type)
         {
             UiThreadRunAsync(() =>
             {

CefSharp/CEFCursorType.cs

@@ -0,0 +1,54 @@
+// Copyright © 2010-2015 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.
+
+namespace CefSharp
+{
+    public enum CefCursorType
+    {
+        Pointer = 0,
+        Cross,
+        Hand,
+        IBeam,
+        Wait,
+        Help,
+        EastResize,
+        NorthResize,
+        NortheastResize,
+        NorthwestResize,
+        SouthResize,
+        SoutheastResize,
+        SouthwestResize,
+        WestResize,
+        NorthSouthResize,
+        EastWestResize,
+        NortheastSouthwestResize,
+        NorthwestSoutheastResize,
+        ColumnResize,
+        RowResize,
+        MiddlePanning,
+        EastPanning,
+        NorthPanning,
+        NortheastPanning,
+        NorthwestPanning,
+        SouthPanning,
+        SoutheastPanning,
+        SouthwestPanning,
+        WestPanning,
+        Move,
+        VerticalText,
+        Cell,
+        ContextMenu,
+        Alias,
+        Progress,
+        NoDrop,
+        Copy,
+        None,
+        NotAllowed,
+        ZoomIn,
+        ZoomOut,
+        Grab,
+        Grabbing,
+        Custom,
+    }
+}

CefSharp/CefSharp.csproj

@@ -93,6 +93,7 @@
     <Compile Include="DefaultResourceHandlerFactory.cs" />
     <Compile Include="DependencyChecker.cs" />
     <Compile Include="IJavascriptCallback.cs" />
+    <Compile Include="CefCursorType.cs" />
     <Compile Include="Internals\IntPtrExtensions.cs" />
     <Compile Include="Internals\JavascriptCallbackProxy.cs" />
     <Compile Include="Internals\JavascriptCallback.cs" />

CefSharp/Internals/IRenderWebBrowser.cs

@@ -13,7 +13,7 @@ public interface IRenderWebBrowser : IWebBrowserInternal
         BitmapInfo CreateBitmapInfo(bool isPopup);
         void InvokeRenderAsync(BitmapInfo bitmapInfo);
 
-        void SetCursor(IntPtr cursor);
+        void SetCursor(IntPtr cursor, CefCursorType type);
 
         void SetPopupIsOpen(bool show);
         void SetPopupSizeAndPosition(int width, int height, int x, int y);