[mac] Redo layout on solid brush editor

This better matches the layout and allowss the lefthand side to scale down whereas
it was previously a fixed size that didn't work well inline.

Author: Eric Maupin

Xamarin.PropertyEditing.Mac/Controls/Custom/ColorComponentEditor.cs

@@ -234,7 +234,7 @@ public override void Layout ()
 			if (Frame.IsEmpty || Frame.IsInfinite () || double.IsNaN (Frame.X) || double.IsInfinity (Frame.X))
 				return;
 
-			var frame = Bounds.Inset (padding, padding);
+			var frame = Bounds.Inset (Padding, Padding);
 			var labelFrame = new CGRect (frame.X, frame.Height - DefaultControlHeight, 20, DefaultControlHeight);
 			var editorFrame = new CGRect (labelFrame.Right, labelFrame.Y, frame.Width - labelFrame.Right, DefaultControlHeight);
 			var yOffset = DefaultControlHeight + DefaultGradientHeight + 3;
@@ -253,10 +253,10 @@ public override void Layout ()
 				editorFrame = editorFrame.Translate (0, -yOffset);
 			}
 
-			this.hexLabel.Frame = new CGRect (frame.X, padding, 20, DefaultControlHeight);
+			this.hexLabel.Frame = new CGRect (frame.X, Padding, 20, DefaultControlHeight);
 			this.hexEditor.Frame = new CGRect (
 				labelFrame.Right,
-				padding,
+				Padding,
 				frame.Width - labelFrame.Right - 16,
 				DefaultControlHeight);
 		}

Xamarin.PropertyEditing.Mac/Controls/Custom/ColorEditorView.cs

@@ -47,7 +47,7 @@ public virtual void OnPropertyChanged (object sender, PropertyChangedEventArgs e
 
 	internal abstract class ColorEditorView : NotifyingView<SolidBrushViewModel>
 	{
-		protected const float padding = 3;
+		protected const float Padding = 3;
 
 		public ColorEditorView (IntPtr handle) : base (handle)
 		{

Xamarin.PropertyEditing.Mac/Controls/Custom/SolidColorBrushEditor.cs

@@ -1,12 +1,11 @@
 using System;
 using System.ComponentModel;
 using System.Linq;
-using System.Runtime.CompilerServices;
+
 using AppKit;
 using CoreAnimation;
 using CoreGraphics;
-using CoreImage;
-using Foundation;
+
 using Xamarin.PropertyEditing.Drawing;
 using Xamarin.PropertyEditing.ViewModels;
 
@@ -79,12 +78,14 @@ private void Initialize (IHostResourceProvider hostResources)
 
 		private readonly CALayer background = new CALayer {
 			CornerRadius = 3,
-			BorderWidth = 1
+			BorderWidth = 1,
+			BorderColor = new CGColor (.5f, .5f, .5f, .5f),
 		};
 
 		private readonly CALayer componentBackground = new CALayer {
 			CornerRadius = 3,
-			BorderWidth = 1
+			BorderWidth = 1,
+			BorderColor = new CGColor (.5f, .5f, .5f, .5f)
 		};
 
 		private EditorInteraction interaction;
@@ -176,36 +177,36 @@ public override void Layout ()
 			if (Frame.IsEmpty || Frame.IsInfinite () || double.IsNaN (Frame.X) || double.IsInfinity (Frame.X))
 				return;
 
-			var secondarySpan = 20;
-			var primarySpan = Frame.Height - 2 * padding - secondarySpan;
-			var firstBase = padding;
-			var secondBase = padding + secondarySpan;
-			var firstStop = firstBase + primarySpan;
-
-			this.background.BorderColor = new CGColor (.5f, .5f, .5f, .5f);
 			this.background.BackgroundColor = NSColor.ControlBackground.CGColor;
-			this.background.Frame = new CGRect (0, 0, Frame.Height, Frame.Height);
-
-			this.componentBackground.BorderColor = new CGColor (.5f, .5f, .5f, .5f);
 			this.componentBackground.BackgroundColor = NSColor.ControlBackground.CGColor;
-			this.componentBackground.Frame = new CGRect (0, 0, Frame.Height, Frame.Height);
+			this.hueLayer.GripColor = NSColor.Text.CGColor;
 
-			var x = firstStop + secondarySpan + 4 * padding;
-			var backgroundFrame = new CGRect (x, 0, Math.Max(Frame.Width - x, 180), Frame.Height);
-			this.componentBackground.Frame = backgroundFrame;
+			const float spacing = 8, hueWidth = 20, historyHeight = 20;
+			const float leftMinWidth = hueWidth + (Padding * 2) + 50;
+			const float rightMinWidth = 125;
+			const float rightRatio = 0.85f;
 
-			this.hueLayer.Frame = new CGRect (firstStop, secondBase, secondarySpan, primarySpan);
-			this.hueLayer.GripColor = NSColor.Text.CGColor;
+			nfloat hspace = Frame.Width - spacing;
+			float leftWidth = Math.Max ((float)(hspace / 2) * (1 + (1 - rightRatio)), leftMinWidth);
+			float rightWidth = Math.Max ((float)(hspace - leftWidth), rightMinWidth);
+			nfloat vspace = Frame.Height - (Padding * 2);
+
+			this.background.Frame = new CGRect (0, 0, leftWidth, Frame.Height);
+
+			var shadeFrame = new CGRect (Padding, Padding + historyHeight + Padding, leftWidth - (Padding * 3) - hueWidth, vspace - historyHeight - Padding);
+			this.shadeLayer.Frame = shadeFrame;
+			this.historyLayer.Frame = new CGRect (Padding, Padding, shadeFrame.Width, historyHeight);
+			this.hueLayer.Frame = new CGRect (this.shadeLayer.Frame.Right + Padding, this.historyLayer.Frame.Bottom + Padding, hueWidth, shadeFrame.Height);
+
+			var backgroundFrame = new CGRect (this.hueLayer.Frame.Right + spacing, 0, rightWidth, Frame.Height);
+			this.componentBackground.Frame = backgroundFrame;
+			var inset = backgroundFrame.Inset (4 * Padding, 2 * Padding);
+			this.componentTabs.View.Frame = inset;
 
-			this.shadeLayer.Frame = new CGRect (firstBase, secondBase, primarySpan, primarySpan);
-			this.historyLayer.Frame = new CGRect (firstBase, firstBase, primarySpan, secondarySpan);
 			var inter = interaction ?? new EditorInteraction (ViewModel, null);
 			foreach (var editor in Layer.Sublayers.OfType<ColorEditorLayer> ()) {
 				editor.UpdateFromModel (inter);
 			}
-
-			var inset = backgroundFrame.Inset (4 * padding, 2 * padding);
-			this.componentTabs.View.Frame = inset;
 		}
 	}
 }