Merge pull request #489 from xamarin/dominique-Fix487

[Mac] ArrangeByMode should use ViewModel ArrangeModes.

1 files changed, 8 insertions, 6 deletions

diff --git a/Xamarin.PropertyEditing.Mac/PropertyEditorPanel.cs b/Xamarin.PropertyEditing.Mac/PropertyEditorPanel.cs
index 30e9b7f..1d3c965 100644
--- a/Xamarin.PropertyEditing.Mac/PropertyEditorPanel.cs
+++ b/Xamarin.PropertyEditing.Mac/PropertyEditorPanel.cs
@@ -73,6 +73,14 @@ namespace Xamarin.PropertyEditing.Mac
 				if (this.viewModel != null) {
 					this.viewModel.ArrangedPropertiesChanged += OnPropertiesChanged;
 					this.viewModel.PropertyChanged += OnVmPropertyChanged;
+
+					this.propertyArrangeMode.RemoveAll ();
+					foreach (ArrangeModeViewModel item in this.viewModel.ArrangeModes) {
+						var itemAsString = new NSString (item.ArrangeMode.ToString ());
+						this.propertyArrangeMode.Add (itemAsString);
+						if (item.IsChecked)
+							this.propertyArrangeMode.Select (itemAsString);
+					}
 				}
 			}
 		}
@@ -123,12 +131,6 @@ namespace Xamarin.PropertyEditing.Mac
 				TranslatesAutoresizingMaskIntoConstraints = false,
 			};
 
-			var enumValues = Enum.GetValues (typeof (PropertyArrangeMode));
-
-			foreach (var item in enumValues) {
-				this.propertyArrangeMode.Add (new NSString (item.ToString ())); // TODO May need translating
-			}
-
 			if (IsArrangeEnabled) {
 				AddSubview (this.propertyArrangeMode);
 				AddSubview (this.propertyArrangeModeLabel);