Mac: Fix firing MouseEnter/Leave when scrolling

picoe · Jul 24, 2023 · b0ba7e4 · b0ba7e4
1 parent ca2cd5d
commit b0ba7e4
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 1 deletion.
diff --git a/lib/monomac b/lib/monomac
diff --git a/src/Eto.Mac/Forms/MacView.cs b/src/Eto.Mac/Forms/MacView.cs
@@ -74,6 +74,28 @@ public void FireMouseLeaveIfNeeded(bool async)
 				h.Callback.OnMouseLeave(h.Widget, MacConversions.GetMouseEvent(h, theEvent, false));
 			}
 		}
+
+		public void FireMouseEnterIfNeeded(bool async)
+		{
+			var h = Handler;
+			if (h == null || entered) return;
+			entered = true;
+			if (async)
+			{
+				Application.Instance.AsyncInvoke(() =>
+				{
+					if (h.Widget.IsDisposed)
+						return;
+					var theEvent = NSApplication.SharedApplication.CurrentEvent;
+					h.Callback.OnMouseEnter(h.Widget, MacConversions.GetMouseEvent(h, theEvent, false));
+				});
+			}
+			else
+			{
+				var theEvent = NSApplication.SharedApplication.CurrentEvent;
+				h.Callback.OnMouseEnter(h.Widget, MacConversions.GetMouseEvent(h, theEvent, false));
+			}
+		}
 
 	}
 
@@ -777,6 +799,16 @@ public virtual void UpdateTrackingAreas()
 
 				tracking = new NSTrackingArea(frame, options, mouseDelegate, null);
 				EventControl.AddTrackingArea(tracking);
+
+				// when scrolling we need to fire the events manually
+				if (Widget.Loaded)
+				{
+					var mousePosition = PointFromScreen(Mouse.Position);
+					if (frame.Contains(mousePosition.ToNS()))
+						mouseDelegate.FireMouseEnterIfNeeded(false);
+					else
+						mouseDelegate.FireMouseLeaveIfNeeded(false);
+				}
 			}
 		}