[mac] Inherit appearance for brush popup

3 files changed, 23 insertions, 0 deletions

diff --git a/Xamarin.PropertyEditing.Mac/Controls/BrushEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/BrushEditorControl.cs
index 6007fdc..67f8e6a 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/BrushEditorControl.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/BrushEditorControl.cs
@@ -80,6 +80,16 @@ namespace Xamarin.PropertyEditing.Mac
 				NSLayoutConstraint.Create (this.popUpButton, NSLayoutAttribute.Width, NSLayoutRelation.Equal, this,  NSLayoutAttribute.Width, 1f, -33f),
 				NSLayoutConstraint.Create (this.popUpButton, NSLayoutAttribute.Height, NSLayoutRelation.Equal, 1f, DefaultControlHeight - 3),
 			});
+
+			ViewDidChangeEffectiveAppearance ();
+		}
+
+		public override void ViewDidChangeEffectiveAppearance ()
+		{
+			base.ViewDidChangeEffectiveAppearance ();
+
+			this.popover.SetAppearance (HostResources.GetVibrantAppearance (EffectiveAppearance));
+			this.popover.ContentViewController.View.Appearance = EffectiveAppearance;
 		}
 
 		readonly ColorPopUpButton popUpButton;
diff --git a/Xamarin.PropertyEditing.Mac/HostResourceProvider.cs b/Xamarin.PropertyEditing.Mac/HostResourceProvider.cs
index 57e1236..591c46d 100644
--- a/Xamarin.PropertyEditing.Mac/HostResourceProvider.cs
+++ b/Xamarin.PropertyEditing.Mac/HostResourceProvider.cs
@@ -7,6 +7,17 @@ namespace Xamarin.PropertyEditing.Mac
 	public class HostResourceProvider
 		: IHostResourceProvider
 	{
+		public virtual NSAppearance GetVibrantAppearance (NSAppearance appearance)
+		{
+			if (appearance == null)
+				throw new ArgumentNullException (nameof (appearance));
+
+			if (appearance.Name == NSAppearance.NameDarkAqua || appearance.Name == NSAppearance.NameVibrantDark)
+				return NSAppearance.GetAppearance (NSAppearance.NameVibrantDark);
+
+			return NSAppearance.GetAppearance (NSAppearance.NameVibrantLight);
+		}
+
 		public virtual NSColor GetNamedColor (string name)
 		{
 			return NSColor.FromName (name);
diff --git a/Xamarin.PropertyEditing.Mac/IHostResourceProvider.cs b/Xamarin.PropertyEditing.Mac/IHostResourceProvider.cs
index 46e7040..3fb3619 100644
--- a/Xamarin.PropertyEditing.Mac/IHostResourceProvider.cs
+++ b/Xamarin.PropertyEditing.Mac/IHostResourceProvider.cs
@@ -5,6 +5,8 @@ namespace Xamarin.PropertyEditing.Mac
 {
 	public interface IHostResourceProvider
 	{
+		NSAppearance GetVibrantAppearance (NSAppearance appearance);
+
 		NSColor GetNamedColor (string name);
 		NSImage GetNamedImage (string name);
 		NSFont GetNamedFont (string name, nfloat fontSize);