(svn r25659) -Fix [FS#4420]: [OSX] System mouse cursor could become visible during dragging. (Matthieu)

1 files changed, 9 insertions, 0 deletions

diff --git a/src/video/cocoa/event.mm b/src/video/cocoa/event.mm
index e9753fdc7..81de0b7b2 100644
--- a/src/video/cocoa/event.mm
+++ b/src/video/cocoa/event.mm
@@ -542,6 +542,15 @@ static bool QZ_PollEvent()
 			_cursor.v_wheel -= (int)([ event deltaY ] * 5 * _settings_client.gui.scrollwheel_multiplier);
 			break;
 
+		case NSCursorUpdate:
+		case NSMouseEntered:
+		case NSMouseExited:
+			/* Catch these events if the cursor is dragging. During dragging, we reset
+			 * the mouse position programmatically, which would trigger OS X to show
+			 * the default arrow cursor if the events are propagated. */
+			if (_cursor.fix_at) break;
+			/* FALL THROUGH */
+
 		default:
 			[ NSApp sendEvent:event ];
 	}