[Mac] Use EditorViewModel in base locations

8 files changed, 17 insertions, 13 deletions

diff --git a/Xamarin.PropertyEditing.Mac/Controls/CombinablePropertyEditor.cs b/Xamarin.PropertyEditing.Mac/Controls/CombinablePropertyEditor.cs
index 3a4ebc9..91fca69 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/CombinablePropertyEditor.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/CombinablePropertyEditor.cs
@@ -29,7 +29,7 @@ namespace Xamarin.PropertyEditing.Mac
 
 		public override bool TriggerRowChange => true;
 
-		public override nint GetHeight (PropertyViewModel vm)
+		public override nint GetHeight (EditorViewModel vm)
 		{
 			var realVm = (CombinablePropertyViewModel<T>)vm;
 			return checkHeight * realVm.Choices.Count;
diff --git a/Xamarin.PropertyEditing.Mac/Controls/PanelHeaderEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/PanelHeaderEditorControl.cs
index cb3a68d..6cdbf15 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/PanelHeaderEditorControl.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/PanelHeaderEditorControl.cs
@@ -186,7 +186,7 @@ namespace Xamarin.PropertyEditing.Mac
 			}
 		}
 
-		public override nint GetHeight (PropertyViewModel vm)
+		public override nint GetHeight (EditorViewModel vm)
 		{
 			return 44;
 		}
diff --git a/Xamarin.PropertyEditing.Mac/Controls/PointEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/PointEditorControl.cs
index 881e34f..963eb08 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/PointEditorControl.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/PointEditorControl.cs
@@ -25,7 +25,7 @@ namespace Xamarin.PropertyEditing.Mac
 			YEditor.Frame = new CGRect (132, 13, 90, 20);
 		}
 
-		public override nint GetHeight (PropertyViewModel vm)
+		public override nint GetHeight (EditorViewModel vm)
 		{
 			return 33;
 		}
diff --git a/Xamarin.PropertyEditing.Mac/Controls/PropertyEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/PropertyEditorControl.cs
index d4cc0d6..20b8736 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/PropertyEditorControl.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/PropertyEditorControl.cs
@@ -77,7 +77,7 @@ namespace Xamarin.PropertyEditing.Mac
 		}
 
 		/// <remarks>You should treat the implementation of this as static.</remarks>
-		public virtual nint GetHeight (PropertyViewModel vm)
+		public virtual nint GetHeight (EditorViewModel vm)
 		{
 			return DefaultControlHeight;
 		}
diff --git a/Xamarin.PropertyEditing.Mac/Controls/RectangleEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/RectangleEditorControl.cs
index 3853314..efcefbc 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/RectangleEditorControl.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/RectangleEditorControl.cs
@@ -37,7 +37,7 @@ namespace Xamarin.PropertyEditing.Mac
 			HeightEditor.Frame = new CGRect (132, 13, 90, 20);
 		}
 
-		public override nint GetHeight (PropertyViewModel vm)
+		public override nint GetHeight (EditorViewModel vm)
 		{
 			return 66;
 		}
diff --git a/Xamarin.PropertyEditing.Mac/Controls/SizeEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/SizeEditorControl.cs
index a514bc2..0152f05 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/SizeEditorControl.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/SizeEditorControl.cs
@@ -26,7 +26,7 @@ namespace Xamarin.PropertyEditing.Mac
 			YEditor.Frame = new CGRect (132, 13, 90, 20);
 		}
 
-		public override nint GetHeight (PropertyViewModel vm)
+		public override nint GetHeight (EditorViewModel vm)
 		{
 			return 33;
 		}
diff --git a/Xamarin.PropertyEditing.Mac/Controls/ThicknessEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/ThicknessEditorControl.cs
index a903689..dea4aa0 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/ThicknessEditorControl.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/ThicknessEditorControl.cs
@@ -36,7 +36,7 @@ namespace Xamarin.PropertyEditing.Mac
 			HeightEditor.Frame = new CGRect (132, 13, 90, 20);
 		}
 
-		public override nint GetHeight (PropertyViewModel vm)
+		public override nint GetHeight (EditorViewModel vm)
 		{
 			return 66;
 		}
diff --git a/Xamarin.PropertyEditing.Mac/PropertyTableDelegate.cs b/Xamarin.PropertyEditing.Mac/PropertyTableDelegate.cs
index ef4a66a..012e278 100644
--- a/Xamarin.PropertyEditing.Mac/PropertyTableDelegate.cs
+++ b/Xamarin.PropertyEditing.Mac/PropertyTableDelegate.cs
@@ -54,10 +54,14 @@ namespace Xamarin.PropertyEditing.Mac
 		// the table is looking for this method, picks it up automagically
 		public override NSView GetView (NSOutlineView outlineView, NSTableColumn tableColumn, NSObject item)
 		{
-			PropertyViewModel vm;
+			EditorViewModel evm;
 			IGroupingList<string, EditorViewModel> group;
 			string cellIdentifier;
-			GetVMGroupCellItendifiterFromFacade (item, out vm, out group, out cellIdentifier);
+			GetVMGroupCellItendifiterFromFacade (item, out evm, out group, out cellIdentifier);
+
+			if (!(evm is PropertyViewModel vm)) {
+				return null;
+			}
 
 			var isGrouping = group != null;
 			// Setup view based on the column
@@ -145,7 +149,7 @@ namespace Xamarin.PropertyEditing.Mac
 
 		public override nfloat GetRowHeight (NSOutlineView outlineView, NSObject item)
 		{
-			PropertyViewModel vm;
+			EditorViewModel vm;
 			IGroupingList<string, EditorViewModel> group;
 			string cellIdentifier;
 			GetVMGroupCellItendifiterFromFacade (item, out vm, out group, out cellIdentifier);
@@ -185,7 +189,7 @@ namespace Xamarin.PropertyEditing.Mac
 			public nint RowSize;
 			public PropertyEditorControl SizingInstance;
 
-			public nint GetHeight (PropertyViewModel vm)
+			public nint GetHeight (EditorViewModel vm)
 			{
 				if (SizingInstance != null)
 					return SizingInstance.GetHeight (vm);
@@ -244,10 +248,10 @@ namespace Xamarin.PropertyEditing.Mac
 			}
 		}
 
-		private void GetVMGroupCellItendifiterFromFacade (NSObject item, out PropertyViewModel vm, out IGroupingList<string, EditorViewModel> group, out string cellIdentifier)
+		private void GetVMGroupCellItendifiterFromFacade (NSObject item, out EditorViewModel vm, out IGroupingList<string, EditorViewModel> group, out string cellIdentifier)
 		{
 			var facade = (NSObjectFacade)item;
-			vm = facade.Target as PropertyViewModel;
+			vm = facade.Target as EditorViewModel;
 			group = facade.Target as IGroupingList<string, EditorViewModel>;
 			cellIdentifier = facade.Target is PanelHeaderEditorControl pvh
 								   ? nameof (PanelHeaderEditorControl)