diff options
| -rw-r--r-- | Xamarin.PropertyEditing.Mac/Controls/BrushEditorControl.cs | 29 | ||||
| -rw-r--r-- | Xamarin.PropertyEditing.Mac/Controls/Custom/SolidColorBrushEditor.cs | 19 |
2 files changed, 30 insertions, 18 deletions
diff --git a/Xamarin.PropertyEditing.Mac/Controls/BrushEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/BrushEditorControl.cs index b6b96ae..930bb68 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/BrushEditorControl.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/BrushEditorControl.cs @@ -30,12 +30,6 @@ namespace Xamarin.PropertyEditing.Mac if (Popover != null) Popover.Show (new CGRect (20, this.Frame.Height/2 - 2.5, 5, 5), this, NSRectEdge.MinYEdge); } - - public override void Layout() - { - base.Layout(); - - } } internal class BrushEditorControl : PropertyEditorControl @@ -45,14 +39,11 @@ namespace Xamarin.PropertyEditing.Mac base.TranslatesAutoresizingMaskIntoConstraints = false; RowHeight = 230f; - //this.colorEditor = new SolidColorBrushEditor (new CGRect (0, 30, 239, 239)); this.colorEditor = new BrushTabViewController (); - this.popover = new NSPopover (); popover.Behavior = NSPopoverBehavior.Transient; - popover.ContentViewController = new SolidColorBrushEditorViewController (); - popover.ContentViewController.PreferredContentSize = new CGSize (200, 200); + popover.ContentViewController = new BrushTabViewController (); this.popUpButton = new ColorPopUpButton { TranslatesAutoresizingMaskIntoConstraints = false, @@ -64,13 +55,11 @@ namespace Xamarin.PropertyEditing.Mac popupButtonList = new NSMenu (); popUpButton.Menu = popupButtonList; - popUpButton.Activated += (o, e) => { - //popover.Show (popUpButton.Frame, popUpButton, NSRectEdge.MinYEdge); - }; - UpdateTheme (); } + + internal new BrushPropertyViewModel ViewModel { get { return (BrushPropertyViewModel)base.ViewModel; } @@ -81,6 +70,9 @@ namespace Xamarin.PropertyEditing.Mac readonly BrushTabViewController colorEditor; readonly NSPopover popover; NSMenu popupButtonList; + readonly CommonBrushLayer previewLayer = new CommonBrushLayer { + Frame = new CGRect (0, 0, 30, 10) + }; bool dataPopulated; @@ -104,7 +96,7 @@ namespace Xamarin.PropertyEditing.Mac { } - public string GetTitle () + string GetTitle () { var title = "Unknown"; switch (ViewModel.Value) { @@ -126,7 +118,7 @@ namespace Xamarin.PropertyEditing.Mac protected override void UpdateValue () { this.colorEditor.ViewModel = ViewModel; - var controller = this.popover.ContentViewController as SolidColorBrushEditorViewController; + var controller = this.popover.ContentViewController as BrushTabViewController; controller.ViewModel = ViewModel; if (ViewModel.Solid != null) { @@ -134,11 +126,12 @@ namespace Xamarin.PropertyEditing.Mac if (popupButtonList.Count == 0) popupButtonList.AddItem (new NSMenuItem ()); - + + previewLayer.Brush = ViewModel.Value; var item = popupButtonList.ItemAt (0); if (item.Title != title) { item.Title = title; - item.Image = ViewModel?.Solid?.Color.CreateSwatch (new CGSize (30, 10)); + item.Image = previewLayer.RenderPreview (); } } } diff --git a/Xamarin.PropertyEditing.Mac/Controls/Custom/SolidColorBrushEditor.cs b/Xamarin.PropertyEditing.Mac/Controls/Custom/SolidColorBrushEditor.cs index e17a7a1..38fa322 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/Custom/SolidColorBrushEditor.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/Custom/SolidColorBrushEditor.cs @@ -178,6 +178,25 @@ namespace Xamarin.PropertyEditing.Mac BrushLayer.Frame = new CGRect (0, 0, Frame.Width, Frame.Height); Contents = DrawingExtensions.GenerateCheckerboard (Frame); } + + public NSImage RenderPreview () + { + var scale = this.ContentsScale; + nint h = (nint)(this.Bounds.Height * scale); + nint w = (nint)(this.Bounds.Width * scale); + nint bytesPerRow = w * 4; + + if (h <= 0 || w <= 0) + return null; + + using (var colorSpace = CGColorSpace.CreateGenericRgb ()) + using (var context = new CGBitmapContext (IntPtr.Zero, w, h, 8, bytesPerRow, colorSpace, CGImageAlphaInfo.PremultipliedLast)) { + this.RenderInContext (context); + using (var image = context.ToImage ()) { + return new NSImage (image, new CGSize (w, h)); + } + } + } } class HistoryLayer : ColorEditorLayer |