[Core] Update SimpleCollectionView filter on setter regardless

2 files changed, 5 insertions, 21 deletions

diff --git a/Xamarin.PropertyEditing/ViewModels/ResourceSelectorViewModel.cs b/Xamarin.PropertyEditing/ViewModels/ResourceSelectorViewModel.cs
index 8bd6f2f..2c8d57e 100644
--- a/Xamarin.PropertyEditing/ViewModels/ResourceSelectorViewModel.cs
+++ b/Xamarin.PropertyEditing/ViewModels/ResourceSelectorViewModel.cs
@@ -154,10 +154,7 @@ namespace Xamarin.PropertyEditing.ViewModels
 				return;
 			}
 
-			if (this.resourcesView.Options.Filter != ResourceFilter)
-				this.resourcesView.Options.Filter = ResourceFilter;
-			else
-				this.resourcesView.UpdateFilter();
+			this.resourcesView.Options.Filter = ResourceFilter;
 		}
 
 		private bool ResourceFilter (object item)
diff --git a/Xamarin.PropertyEditing/ViewModels/SimpleCollectionView.cs b/Xamarin.PropertyEditing/ViewModels/SimpleCollectionView.cs
index c0b2245..f07f967 100644
--- a/Xamarin.PropertyEditing/ViewModels/SimpleCollectionView.cs
+++ b/Xamarin.PropertyEditing/ViewModels/SimpleCollectionView.cs
@@ -71,9 +71,8 @@ namespace Xamarin.PropertyEditing.ViewModels
 			get { return this.filter; }
 			set
 			{
-				if (this.filter == value)
-					return;
-
+				// Purposefully doesn't check for existing equality since a common case is setting to the same delegate but
+				// variables it checks only have changed.
 				this.filter = value;
 				OnPropertyChanged();
 			}
@@ -112,19 +111,6 @@ namespace Xamarin.PropertyEditing.ViewModels
 
 		public bool IsFiltering => Options?.Filter != null;
 
-		/// <summary>
-		/// Forces an update of the contens as if the filter has changed.
-		/// </summary>
-		/// <remarks>
-		/// Some filters may not change their delegate, but that delegate may act different based on outside forces.
-		/// In that scenario, call this to trigger the update.
-		/// </remarks>
-		public void UpdateFilter()
-		{
-			FilterCore (isPureSubset: this.wasFilterNull);
-			this.wasFilterNull = Options.Filter == null;
-		}
-
 		public IEnumerator GetEnumerator ()
 		{
 			bool haveChildren = (Options.ChildOptions != null);
@@ -215,7 +201,8 @@ namespace Xamarin.PropertyEditing.ViewModels
 		private void OnOptionsPropertyChanged (object sender, PropertyChangedEventArgs e)
 		{
 			if (e.PropertyName == nameof(SimpleCollectionViewOptions.Filter)) {
-				UpdateFilter();
+				FilterCore (isPureSubset: this.wasFilterNull);
+				this.wasFilterNull = Options.Filter == null;
 			} else
 				Reset();
 		}