From 80aed4a686658c2f721ef749310a140aa1f10524 Mon Sep 17 00:00:00 2001 From: Eric Maupin Date: Fri, 11 Jan 2019 15:04:40 -0500 Subject: [mac] Fix CommonBrushLayer background, remove dead drawing --- Xamarin.PropertyEditing.Mac/Controls/Custom/CommonBrushLayer.cs | 2 +- Xamarin.PropertyEditing.Mac/Controls/Custom/DrawingExtensions.cs | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) (limited to 'Xamarin.PropertyEditing.Mac/Controls/Custom') diff --git a/Xamarin.PropertyEditing.Mac/Controls/Custom/CommonBrushLayer.cs b/Xamarin.PropertyEditing.Mac/Controls/Custom/CommonBrushLayer.cs index 12f16b1..543538f 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/Custom/CommonBrushLayer.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/Custom/CommonBrushLayer.cs @@ -69,7 +69,7 @@ namespace Xamarin.PropertyEditing.Mac { base.LayoutSublayers (); BrushLayer.Frame = Bounds; - Contents = DrawingExtensions.GenerateCheckerboard (Bounds, this.hostResources.GetNamedColor (NamedResources.Checkerboard0Color), this.hostResources.GetNamedColor (NamedResources.Checkerboard0Color)); + Contents = DrawingExtensions.GenerateCheckerboard (Bounds, this.hostResources.GetNamedColor (NamedResources.Checkerboard0Color), this.hostResources.GetNamedColor (NamedResources.Checkerboard1Color)); } public NSImage RenderPreview () diff --git a/Xamarin.PropertyEditing.Mac/Controls/Custom/DrawingExtensions.cs b/Xamarin.PropertyEditing.Mac/Controls/Custom/DrawingExtensions.cs index 3b983bc..c8dbbef 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/Custom/DrawingExtensions.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/Custom/DrawingExtensions.cs @@ -8,12 +8,6 @@ namespace Xamarin.PropertyEditing.Mac { static class DrawingExtensions { - public static NSImage CreateSwatch (this CommonColor color, CGSize size, NSColor c0, NSColor c1) - => CreateSwatch (color, size, CIColor.FromCGColor (c0.CGColor), CIColor.FromCGColor (c1.CGColor)); - - public static NSImage CreateSwatch (this CommonColor color, CGSize size, CIColor c0, CIColor c1) - => new NSImage (GenerateCheckerboard (new CGRect (0, 0, size.Width, size.Height), c0, c1), size); - public static CGImage GenerateCheckerboard (CGRect frame, NSColor c0, NSColor c1) { return GenerateCheckerboard (frame, CIColor.FromCGColor (c0.CGColor), CIColor.FromCGColor (c1.CGColor)); -- cgit v1.2.3