From a87ee4e49de7b862220da654962624b9c85daf40 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Tue, 24 Oct 2017 17:36:17 -0500
Subject: [PATCH] Clean up DelayedSetter code.

---
 src/Avalonia.Base/AvaloniaObject.cs          | 4 ++--
 src/Avalonia.Base/Utilities/DelayedSetter.cs | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/Avalonia.Base/AvaloniaObject.cs b/src/Avalonia.Base/AvaloniaObject.cs
index 1c4f727161..f0e385cf94 100644
--- a/src/Avalonia.Base/AvaloniaObject.cs
+++ b/src/Avalonia.Base/AvaloniaObject.cs
@@ -590,8 +590,8 @@ namespace Avalonia
             }
         }
 
-        protected void SetAndRaise<T>(AvaloniaProperty<T> property, Action<T, Action<Action>> setterCallback, T value)
-            => directDelayedSetter.SetAndNotify(property, (val, notify) => setterCallback((T)val, notify), value);
+        protected void SetAndRaise<T>(AvaloniaProperty<T> property, Action<T, Action<Action>> setterCallback, T value, Predicate<T> pendingSetCondition = null)
+            => directDelayedSetter.SetAndNotify(property, (val, notify) => setterCallback((T)val, notify), value, o => pendingSetCondition((T)o));
 
         /// <summary>
         /// Tries to cast a value to a type, taking into account that the value may be a
diff --git a/src/Avalonia.Base/Utilities/DelayedSetter.cs b/src/Avalonia.Base/Utilities/DelayedSetter.cs
index 155e4509a2..a8eb7554be 100644
--- a/src/Avalonia.Base/Utilities/DelayedSetter.cs
+++ b/src/Avalonia.Base/Utilities/DelayedSetter.cs
@@ -86,8 +86,5 @@ namespace Avalonia.Utilities
                 AddPendingSet(property, value);
             }
         }
-
-        public void SetAndNotify(T property, Action<TValue, Action<Action>> setterCallback, TValue value)
-            => SetAndNotify(property, setterCallback, value, null);
     }
 }