[Mac] Tabbing to OutlineView

2 files changed, 49 insertions, 1 deletions

diff --git a/Xamarin.PropertyEditing.Mac/Controls/CategoryContainerControl.cs b/Xamarin.PropertyEditing.Mac/Controls/CategoryContainerControl.cs
new file mode 100644
index 0000000..dfec28e
--- /dev/null
+++ b/Xamarin.PropertyEditing.Mac/Controls/CategoryContainerControl.cs
@@ -0,0 +1,44 @@
+using System;
+using AppKit;
+
+namespace Xamarin.PropertyEditing.Mac
+{
+	internal class CategoryContainerControl
+		: PropertyEditorControl
+	{
+		private NSOutlineView outlineView;
+		private NSButton disclosure;
+
+		public CategoryContainerControl (IHostResourceProvider hostResources, NSOutlineView outlineView) : base (hostResources)
+		{
+			if (outlineView == null)
+				throw new ArgumentNullException (nameof (outlineView));
+
+			this.outlineView = outlineView;
+
+			this.disclosure = this.outlineView.MakeView ("NSOutlineViewDisclosureButtonKey", outlineView) as NSButton;
+			this.disclosure.TranslatesAutoresizingMaskIntoConstraints = false;
+			AddSubview (this.disclosure);
+
+			var label = new UnfocusableTextField {
+				TranslatesAutoresizingMaskIntoConstraints = false
+			};
+			AddSubview (label);
+
+			AddConstraints (new[] {
+				NSLayoutConstraint.Create (this.disclosure, NSLayoutAttribute.CenterY, NSLayoutRelation.Equal, this, NSLayoutAttribute.CenterY, 1, 0),
+				NSLayoutConstraint.Create (this.disclosure, NSLayoutAttribute.Left, NSLayoutRelation.Equal, this, NSLayoutAttribute.Left, 1, 4),
+				NSLayoutConstraint.Create (label, NSLayoutAttribute.Left, NSLayoutRelation.Equal, this.disclosure, NSLayoutAttribute.Right, 1, 0),
+				NSLayoutConstraint.Create (label, NSLayoutAttribute.Height, NSLayoutRelation.Equal, this, NSLayoutAttribute.Height, 1, 0),
+			});
+		}
+
+		public override bool IsDynamicallySized => false;
+
+		public override bool NeedsPropertyButton => false;
+
+		public override NSView FirstKeyView => this.disclosure;
+
+		public override NSView LastKeyView => this.disclosure;
+	}
+}
diff --git a/Xamarin.PropertyEditing.Mac/Controls/PropertyEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/PropertyEditorControl.cs
index bdbef92..e2d5eb9 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/PropertyEditorControl.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/PropertyEditorControl.cs
@@ -86,7 +86,11 @@ namespace Xamarin.PropertyEditing.Mac
 				do {
 					row--;
 					view = TableView.GetView (0, row, makeIfNecessary: false);
-					ctrl = (view as EditorContainer)?.EditorView?.NativeView as PropertyEditorControl;
+					if (view is PropertyEditorControl pec) { // This is to include the CategoryContainer
+						ctrl = pec;
+					} else {
+						ctrl = (view as EditorContainer)?.EditorView?.NativeView as PropertyEditorControl;
+					}
 				} while (row > 0 && ctrl == null);
 
 				if (ctrl != null) {