Mac: Fix MouseUp on many controls that use event loops with MouseDown.

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

@@ -35,17 +35,6 @@ public override void Activate(bool exclusive)
 				if (handler != null)
 				{
 					NSColorPanel.SharedColorPanel.ShowsAlpha = handler.AllowAlpha;
-					handler.TriggerMouseCallback();
-				}
-			}
-
-			public override void Deactivate()
-			{
-				base.Deactivate();
-				var handler = Handler;
-				if (handler != null)
-				{
-					handler.TriggerMouseCallback();
 				}
 			}
 

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

@@ -74,13 +74,15 @@ public override void RightMouseDown(NSEvent theEvent)
 				if (HandleMouseEvent(theEvent))
 					return;
 				base.RightMouseDown(theEvent);
+				Handler?.TriggerMouseCallback();
 			}
 
 			public override void OtherMouseDown(NSEvent theEvent)
 			{
 				if (HandleMouseEvent(theEvent))
 					return;
 				base.OtherMouseDown(theEvent);
+				Handler?.TriggerMouseCallback();
 			}
 
 			public override void MouseDown(NSEvent theEvent)
@@ -97,6 +99,7 @@ public override void MouseDown(NSEvent theEvent)
 				h.IsMouseDragging = true;
 				base.MouseDown(theEvent);
 				h.IsMouseDragging = false;
+				h.TriggerMouseCallback();
 			}
 
 			bool HandleMouseEvent(NSEvent theEvent)
@@ -106,11 +109,17 @@ bool HandleMouseEvent(NSEvent theEvent)
 				{
 					var args = MacConversions.GetMouseEvent(handler, theEvent, false);
 					if (theEvent.ClickCount >= 2)
+					{
 						handler.Callback.OnMouseDoubleClick(handler.Widget, args);
+						if (args.Handled)
+							return false;
+					}
 					else
+					{
 						handler.Callback.OnMouseDown(handler.Widget, args);
-					if (args.Handled)
-						return true;
+						if (args.Handled)
+							return true;
+					}
 
 					var point = ConvertPointFromView(theEvent.LocationInWindow, null);
 

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

@@ -38,6 +38,14 @@ namespace Eto.Mac.Forms.Controls
 	public class GroupBoxHandler : MacPanel<NSBox, GroupBox, GroupBox.ICallback>, GroupBox.IHandler
 	{
 		SizeF? borderSize;
+
+		/// <summary>
+		/// Use a separate class so it doesn't get event methods added
+		/// </summary>
+		public class EtoContentView : MacPanelView
+		{
+
+		}
 
 		public class EtoBox : NSBox, IMacControl
 		{
@@ -53,7 +61,7 @@ public EtoBox(GroupBoxHandler handler)
 			{
 				Title = string.Empty;
 				TitlePosition = NSTitlePosition.NoTitle;
-				ContentView = new MacPanelView { Handler = handler };
+				ContentView = new EtoContentView { Handler = handler };
 			}
 		}
 

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

@@ -145,21 +145,24 @@ public override void AttachEvent(string id)
 			switch (id)
 			{
 				case LinkButton.ClickEvent:
-					Widget.MouseDown += (sender, e) =>
-					{
-						if (Enabled && e.Buttons == MouseButtons.Primary)
-						{
-							Callback.OnClick(Widget, EventArgs.Empty);
-							e.Handled = true;
-						}
-					};
+					HandleEvent(LinkButton.MouseUpEvent);
 					break;
 				default:
 					base.AttachEvent(id);
 					break;
 			}
 		}
 
+		public override MouseEventArgs TriggerMouseUp(NSObject obj, IntPtr sel, NSEvent theEvent)
+		{
+			var args = base.TriggerMouseUp(obj, sel, theEvent);
+			if (!args.Handled && Enabled && args.Buttons == MouseButtons.Primary)
+			{
+				Callback.OnClick(Widget, EventArgs.Empty);
+			}
+			return args;
+		}
+
 		static readonly object DisabledTextColorKey = new object();
 
 		public Color DisabledTextColor

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

@@ -19,7 +19,11 @@ namespace Eto.Mac.Forms.Controls
 {
 	public class PanelHandler : MacPanel<NSView, Panel, Panel.ICallback>, Panel.IHandler
 	{
-		protected override NSView CreateControl() => new MacPanelView();
+		public class EtoPanelView : MacPanelView
+		{
+		}
+
+		protected override NSView CreateControl() => new EtoPanelView();
 
 		public override NSView ContainerControl => Control;
 	}

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

@@ -108,6 +108,7 @@ public class EtoTextField : NSTextField, IMacControl, ITextBoxWithMaxLength
 	{
 		public WeakReference WeakHandler { get; set; }
 
+		IMacViewHandler Handler => WeakHandler.Target as IMacViewHandler;
 		IMacText TextHandler => WeakHandler.Target as IMacText;
 		ITextBoxWithMaxLength MaxLengthHandler => WeakHandler.Target as ITextBoxWithMaxLength;
 
@@ -145,12 +146,32 @@ public void TextViewDidChangeSelection(NSNotification notification)
 
 		public override void MouseDown(NSEvent theEvent)
 		{
-			base.MouseDown(theEvent);
 			var h = TextHandler;
 			if (h != null && h.AutoSelectMode == AutoSelectMode.Always && CurrentEditor?.SelectedRange.Length == 0)
 			{
 				CurrentEditor?.SelectAll(this);
 			}
+
+			var handler = Handler;
+			if (handler == null)
+				return;
+			var args = MacConversions.GetMouseEvent(handler, theEvent, false);
+			if (theEvent.ClickCount >= 2)
+				handler.Callback.OnMouseDoubleClick(handler.Widget, args);
+
+			if (!args.Handled)
+			{
+				handler.Callback.OnMouseDown(handler.Widget, args);
+			}
+			if (!args.Handled)
+			{
+				handler.SuppressMouseEvents++;
+				base.MouseDown(theEvent);
+				handler.SuppressMouseEvents--;
+
+				// some controls use event loops until mouse up, so we need to trigger the mouse up here.
+				handler.TriggerMouseCallback();
+			}
 		}
 	}
 

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

@@ -635,7 +635,7 @@ public override void MouseDown(NSEvent theEvent)
 					handler.IsMouseDragging = false;
 
 					// NSOutlineView uses an event loop and MouseUp() does not get called
-					handler.Callback.OnMouseUp(handler.Widget, args);
+					handler.TriggerMouseCallback();
 
 					return;
 				}

src/Eto.Mac/Forms/MacFieldEditor.cs

@@ -44,6 +44,8 @@ public MacFieldEditor(IntPtr handle)
 
 		public IMacControl MacControl => WeakDelegate as IMacControl;
 		public object Handler => MacControl?.WeakHandler?.Target;
+
+		public IMacViewHandler MacViewHandler => Handler as IMacViewHandler;
 
 		WeakReference IMacControl.WeakHandler
 		{
@@ -69,12 +71,19 @@ public override void FlagsChanged(NSEvent theEvent)
 			base.FlagsChanged(theEvent);
 		}
 
-		bool MouseDownEvent(NSEvent theEvent)
+		void MouseDownEvent(NSEvent theEvent, Action<NSEvent> baseMethod)
 		{
 			var handler = Handler as IMacViewHandler;
 			if (handler == null)
-				return false;
+				return;
 
+			if (handler.SuppressMouseEvents > 0)
+			{
+				// we can get called from a MouseDown from the owning object
+				baseMethod(theEvent);
+				return;
+			}
+
 			var args = MacConversions.GetMouseEvent(handler, theEvent, false);
 			if (theEvent.ClickCount >= 2)
 				handler.Callback.OnMouseDoubleClick(handler.Widget, args);
@@ -83,8 +92,14 @@ bool MouseDownEvent(NSEvent theEvent)
 			{
 				handler.Callback.OnMouseDown(handler.Widget, args);
 			}
+
+			if (!args.Handled)
+			{
+				baseMethod(theEvent);
 
-			return args.Handled;
+				// trigger mouse up here, if needed				
+				handler.TriggerMouseCallback();
+			}
 		}
 
 		bool MouseUpEvent(NSEvent theEvent)
@@ -100,20 +115,18 @@ bool MouseUpEvent(NSEvent theEvent)
 
 		public override void MouseDown(NSEvent theEvent)
 		{
-			if (!MouseDownEvent(theEvent))
-				base.MouseDown(theEvent);
+			MouseDownEvent(theEvent, base.MouseDown);
 		}
 
 		public override void MouseUp(NSEvent theEvent)
 		{
 			if (!MouseUpEvent(theEvent))
 				base.MouseUp(theEvent);
 		}
-
+		
 		public override void RightMouseDown(NSEvent theEvent)
 		{
-			if (!MouseDownEvent(theEvent))
-				base.RightMouseDown(theEvent);
+			MouseDownEvent(theEvent, base.RightMouseDown);
 		}
 
 		public override void RightMouseUp(NSEvent theEvent)
@@ -124,8 +137,7 @@ public override void RightMouseUp(NSEvent theEvent)
 
 		public override void OtherMouseDown(NSEvent theEvent)
 		{
-			if (!MouseDownEvent(theEvent))
-				base.OtherMouseDown(theEvent);
+			MouseDownEvent(theEvent, base.OtherMouseDown);
 		}
 
 		public override void OtherMouseUp(NSEvent theEvent)