[mac] Work around oddity with EdgeInsets on the TabView

2 files changed, 5 insertions, 5 deletions

diff --git a/Xamarin.PropertyEditing.Mac/Controls/Custom/MaterialView.cs b/Xamarin.PropertyEditing.Mac/Controls/Custom/MaterialView.cs
index c9fced8..63f890a 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/Custom/MaterialView.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/Custom/MaterialView.cs
@@ -117,7 +117,7 @@ namespace Xamarin.PropertyEditing.Mac
 			foreach (var color in MaterialDesign.NormalColorScale) {
 				var l = CreateLayer (color.Value);
 				l.ColorType = MaterialColorType.Normal;
-				l.IsSelected = color.Value == MaterialDesign.NormalColor;
+				l.IsSelected = color.Value == MaterialDesign.NormalColor || color.Value == MaterialDesign.Color || color.Value == ViewModel.Solid.Color;
 				l.Frame = new CGRect (x, 0, width, height);
 				normal.AddSublayer (l);
 				x += width;
@@ -141,7 +141,7 @@ namespace Xamarin.PropertyEditing.Mac
 			foreach (var color in MaterialDesign.AccentColorScale) {
 				var l = CreateLayer (color.Value);
 				l.ColorType = MaterialColorType.Accent;
-				l.IsSelected = color.Value == MaterialDesign.AccentColor;
+				l.IsSelected = color.Value == MaterialDesign.AccentColor || color.Value == MaterialDesign.Color || color.Value == ViewModel.Solid.Color;
 				l.Frame = new CGRect (x, 0, width, height);
 				accent.AddSublayer (l);
 				x += width;
diff --git a/Xamarin.PropertyEditing.Mac/Controls/Custom/UnderlinedTabViewController.cs b/Xamarin.PropertyEditing.Mac/Controls/Custom/UnderlinedTabViewController.cs
index f520d86..0823089 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/Custom/UnderlinedTabViewController.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/Custom/UnderlinedTabViewController.cs
@@ -82,18 +82,18 @@ namespace Xamarin.PropertyEditing.Mac
 			this.outerStack = new NSStackView () {
 				Orientation = NSUserInterfaceLayoutOrientation.Horizontal,
 				Spacing = 0,
-				EdgeInsets = EdgeInsets
+				EdgeInsets = new NSEdgeInsets (0, edgeInsets.Left, 0, edgeInsets.Right)
 			};
 
 			this.innerStack = new NSStackView () {
 				Spacing = 0,
 				Alignment = NSLayoutAttribute.Left,
 				Orientation = NSUserInterfaceLayoutOrientation.Vertical,
-				EdgeInsets = EdgeInsets
+				EdgeInsets = new NSEdgeInsets (edgeInsets.Top, 0, edgeInsets.Bottom, 0)
 			};
 
 			this.outerStack.AddView (this.innerStack, NSStackViewGravity.Leading);
-			this.innerStack.AddView (this.tabStack, NSStackViewGravity.Top);
+			this.innerStack.AddView (this.tabStack, NSStackViewGravity.Leading);
 			this.innerStack.AddView (TabView, NSStackViewGravity.Bottom);
 			View = this.outerStack;
 		}