[Mac] More generalized solution for restoring focus when popover is repopped up

1 files changed, 0 insertions, 31 deletions

diff --git a/Xamarin.PropertyEditing.Mac/Controls/BrushEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/BrushEditorControl.cs
index 7520f31..cb8bc44 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/BrushEditorControl.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/BrushEditorControl.cs
@@ -22,8 +22,6 @@ namespace Xamarin.PropertyEditing.Mac
 
 			if (!Popover.Shown) {
 				Popover.Show (new CGRect (26, this.Frame.Height / 2 - 2, 2, 2), this, NSRectEdge.MinYEdge);
-				Window.MakeFirstResponder (this);
-				Window.MakeFirstResponder (Popover);
 			}
 		}
 
@@ -37,33 +35,6 @@ namespace Xamarin.PropertyEditing.Mac
 		}
 	}
 
-	internal class ColorPopOverDelegate : NSPopoverDelegate
-	{
-		private BrushTabViewController brushTabViewController;
-		private CommonBrushType selectedBrushType = CommonBrushType.None;
-
-		internal ColorPopOverDelegate (BrushTabViewController brushTabViewController)
-		{
-			if (brushTabViewController == null)

-				throw new ArgumentNullException (nameof (brushTabViewController));
-
-			this.brushTabViewController = brushTabViewController;
-		}
-
-		public override void WillShow (NSNotification notification)
-		{
-			if (this.brushTabViewController.ViewModel != null) {
-				var ct = new CancellationTokenSource ();
-				Task.Factory.StartNew (()=> {
-					if (this.selectedBrushType == CommonBrushType.None)
-						this.selectedBrushType = this.brushTabViewController.ViewModel.SelectedBrushType;
-					else
-						this.brushTabViewController.ViewModel.SelectedBrushType = this.selectedBrushType;
-				}, ct.Token, TaskCreationOptions.None, TaskScheduler.FromCurrentSynchronizationContext ());
-			}
-		}
-	}
-
 	internal class BrushEditorControl : PropertyEditorControl<BrushPropertyViewModel>
 	{
 		public BrushEditorControl (IHostResourceProvider hostResources)
@@ -81,8 +52,6 @@ namespace Xamarin.PropertyEditing.Mac
 				}
 			};
 
-			this.popover.Delegate = new ColorPopOverDelegate (this.brushTabViewController);
-
 			this.popUpButton = new ColorPopUpButton {
 				ControlSize = NSControlSize.Small,
 				Font = NSFont.SystemFontOfSize (NSFont.SystemFontSizeForControlSize (NSControlSize.Small)),