Fixing chromelyapps/Chromely#263.

chromelyapps · Nov 30, 2020 · aa1390c · aa1390c
1 parent bd0caed
commit aa1390c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/src/Chromely.CefSharp/NativeHost/Frameless/DwmFramelessController.cs b/src/Chromely.CefSharp/NativeHost/Frameless/DwmFramelessController.cs
@@ -412,11 +412,9 @@ private void UninstallDragMouseHook()
         private void MouseLLHook_MouseMoveHandler(object sender, MouseMoveEventArgs eventArgs)
         {
             if (_windowHandle != IntPtr.Zero &&
-                eventArgs != null &&
-                eventArgs.DeltaChangeSize != null &&
-                !eventArgs.DeltaChangeSize.IsEmpty)
+                eventArgs != null)
             {
-                SetWindowPos(_windowHandle, IntPtr.Zero, 0, 0, eventArgs.DeltaChangeSize.Width, eventArgs.DeltaChangeSize.Height, 
+                SetWindowPos(_windowHandle, IntPtr.Zero, eventArgs.DeltaX, eventArgs.DeltaY, 0, 0,
                                     SWP.NOACTIVATE
                                     | SWP.NOZORDER
                                     | SWP.NOOWNERZORDER

diff --git a/src/Chromely.CefSharp/NativeHost/Hooks/DragMouseLLHook.cs b/src/Chromely.CefSharp/NativeHost/Hooks/DragMouseLLHook.cs
@@ -76,12 +76,12 @@ private bool GetCurrentCursorLocation(IntPtr lParam, ref POINT cursorPos)
 
 		#region
 
-		static void OnMouseMove(int xDelta, int yDelta)
+		static void OnMouseMove(int deltaX, int deltaY)
 		{
 			var handler = MouseMoveHandler;
 			if (handler != null)
 			{
-				var args = new MouseMoveEventArgs(xDelta, yDelta);
+				var args = new MouseMoveEventArgs(deltaX, deltaY);
 				handler.Invoke(null, args);
 			}
 		}

diff --git a/src/Chromely.CefSharp/NativeHost/Hooks/MouseMoveEventArgs.cs b/src/Chromely.CefSharp/NativeHost/Hooks/MouseMoveEventArgs.cs
@@ -8,16 +8,19 @@ namespace Chromely.CefSharp.NativeHost
 {
     public class MouseMoveEventArgs : EventArgs
     {
-        public MouseMoveEventArgs(int xDelta, int yDelta)
+        public MouseMoveEventArgs(int deltaX, int deltaY)
         {
-            DeltaChangeSize = new Size(xDelta, yDelta);
+            DeltaX = deltaX;
+            DeltaY = deltaY;
         }
 
         public MouseMoveEventArgs(Size deltaSize)
         {
-            DeltaChangeSize = deltaSize;
+            DeltaX = deltaSize.Width;
+            DeltaY = deltaSize.Height;
         }
 
-        public Size DeltaChangeSize { get; set; }
-     }
+        public int DeltaX { get; set; }
+        public int DeltaY { get; set; }
+    }
 }