[mac] Fix viewmodel propagation

Eric Maupin · Eric Maupin · commit 5d2c8e1ccee5 · 2019-03-06T14:22:13.000-05:00
diff --git a/Xamarin.PropertyEditing.Mac/PropertyTableDelegate.cs b/Xamarin.PropertyEditing.Mac/PropertyTableDelegate.cs
@@ -93,6 +93,7 @@ public override NSView GetView (NSOutlineView outlineView, NSTableColumn tableCo
 			}
 
 			if (editorOrContainer is EditorContainer ec) {
+				ec.ViewModel = evm;
 				ec.Label = evm.Name;
 
 #if DEBUG // Currently only used to highlight which controls haven't been implemented
@@ -110,9 +111,7 @@ public override NSView GetView (NSOutlineView outlineView, NSTableColumn tableCo
 					} else if (!ovm.CanDelve) {
 						container.LeftEdgeView = null;
 					}
-
-					container.ViewModel = evm;
-				} else {
+				} else if (!(editorOrContainer is EditorContainer)) {
 					editor.ViewModel = evm;
 				}
 

Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,7 @@ public override NSView GetView (NSOutlineView outlineView, NSTableColumn tableCo`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`if (editorOrContainer is EditorContainer ec) {`
	`96`	`+ ec.ViewModel = evm;`
`96`	`97`	`ec.Label = evm.Name;`
`97`	`98`
`98`	`99`	`#if DEBUG // Currently only used to highlight which controls haven't been implemented`
`@@ -110,9 +111,7 @@ public override NSView GetView (NSOutlineView outlineView, NSTableColumn tableCo`
`110`	`111`	`} else if (!ovm.CanDelve) {`
`111`	`112`	`container.LeftEdgeView = null;`
`112`	`113`	`}`
`113`		`-`
`114`		`- container.ViewModel = evm;`
`115`		`- } else {`
	`114`	`+ } else if (!(editorOrContainer is EditorContainer)) {`
`116`	`115`	`editor.ViewModel = evm;`
`117`	`116`	`}`
`118`	`117`