cursor in CoolBar

2 files changed, 25 insertions, 6 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java
index 3b850d2089..4e48cc96a7 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java
@@ -2489,7 +2489,22 @@ public void setCursor (Cursor cursor) {
 	checkWidget();
 	if (cursor != null && cursor.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
 	this.cursor = cursor;
-	view.window().invalidateCursorRectsForView(view);
+	NSWindow window = view.window();
+	NSPoint location = window.convertScreenToBase(NSEvent.mouseLocation());
+	NSView view = window.contentView().hitTest(location);
+	Control control = null;
+	if (view != null) {
+		do {
+			Widget widget = display.getWidget (view);
+			if (widget instanceof Control) {
+				control = (Control)widget;
+				break;
+			}
+			view = view.superview();
+		} while (view != null);
+	}
+	if (control != null && control.isTrim (view)) control = null;
+	display.setCursor (control);
 }
 
 void setDefaultFont () {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java
index 9a81a05264..646b21f227 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java
@@ -2693,6 +2693,13 @@ void setCurrentCaret (Caret caret) {
 	}
 }
 
+void setCursor (Control control) {
+	Cursor cursor = null;
+	if (control != null) cursor = control.findCursor ();
+	if (cursor == null) cursor = getSystemCursor (SWT.CURSOR_ARROW);
+	cursor.handle.set ();
+}
+
 /**
  * Sets the location of the on-screen pointer relative to the top left corner
  * of the screen.  <b>Note: It is typically considered bad practice for a
@@ -3180,18 +3187,15 @@ void applicationSendMouseEvent (NSEvent nsEvent, boolean send) {
 		case OS.NSMouseMoved: {
 			Control control = findControl(nsEvent);
 			if (control != currentControl) {
-				Cursor cursor = null;
-				if (control != null) cursor = control.findCursor ();
-				if (cursor == null) cursor = getSystemCursor (SWT.CURSOR_ARROW);
-				cursor.handle.set ();
 				if (currentControl != null) {
 					currentControl.sendMouseEvent (nsEvent, SWT.MouseExit, send);
 				}
+				currentControl = control;
 				if (control != null) {
 					control.sendMouseEvent (nsEvent, SWT.MouseEnter, send);
 					if (up) timerExec (getToolTipTime (), hoverTimer);
 				}
-				currentControl = control;
+				setCursor (control);
 			}
 			if (!up && control != null) {
 				timerExec (getToolTipTime (), hoverTimer);