Merge pull request #2234 from cwensley/curtis/mac-accept-first-mouse-on-floating-form

Mac: Accept first mouse events on FloatingForm when active

Author: cwensley

src/Eto.Mac/Forms/Controls/DrawableHandler.cs

@@ -37,8 +37,6 @@ public override void DrawRect(CGRect dirtyRect)
 
 			public override bool AcceptsFirstResponder() => CanFocus;
 
-			public override bool AcceptsFirstMouse(NSEvent theEvent) => CanFocus || base.AcceptsFirstMouse(theEvent);
-
 			public override NSView HitTest(CGPoint aPoint)
 			{
 				var view = base.HitTest(aPoint);
@@ -130,5 +128,12 @@ public void Update(Rectangle rect)
 		{
 			Control.DisplayRect(rect.ToNS());
 		}
+
+		protected override bool OnAcceptsFirstMouse(NSEvent theEvent)
+		{
+			if (CanFocus)
+				return true;
+			return base.OnAcceptsFirstMouse(theEvent);
+		}
 	}
 }

src/Eto.Mac/Forms/Controls/SplitterHandler.cs

@@ -343,6 +343,11 @@ public override void Layout()
 				if (!MacView.NewLayout)
 					base.Layout();
 			}
+
+			public override bool AcceptsFirstMouse(NSEvent theEvent)
+			{
+				return Handler != null ? Handler.OnAcceptsFirstMouse(theEvent) : base.AcceptsFirstMouse(theEvent);
+			}
 		}
 
 		bool changeStarted;

src/Eto.Mac/Forms/MacView.cs

@@ -1419,21 +1419,22 @@ public event EventHandler<MouseEventArgs> AcceptsFirstMouse
 			remove => Widget.Properties.RemoveEvent(MacView.AcceptsFirstMouse_Key, value);
 		}
 
-		protected virtual void OnAcceptsFirstMouse(MouseEventArgs e)
-		{
-			Widget?.Properties.TriggerEvent(MacView.AcceptsFirstMouse_Key, this, e);
-		}
-
-		bool IMacViewHandler.OnAcceptsFirstMouse(NSEvent theEvent)
+		protected virtual bool OnAcceptsFirstMouse(NSEvent theEvent)
 		{
 			if (!Widget.Properties.ContainsKey(MacView.AcceptsFirstMouse_Key))
+			{
+				if (ContainerControl.Window is NSPanel)
+					return Application.Instance.IsActive;
 				return false;
+			}
 
 			var args = MacConversions.GetMouseEvent(this, theEvent, false);
-			OnAcceptsFirstMouse(args);
+			Widget.Properties.TriggerEvent(MacView.AcceptsFirstMouse_Key, this, args);
 			return args.Handled;
 		}
 
+		bool IMacViewHandler.OnAcceptsFirstMouse(NSEvent theEvent) => OnAcceptsFirstMouse(theEvent);
+
 		public virtual MouseEventArgs TriggerMouseDown(NSObject obj, IntPtr sel, NSEvent theEvent)
 		{
 			// Flag that we are going to use a mouse tracking loop