From 8233f4df185516db9a469611c737efc582c4311c Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 16 Feb 2016 23:10:33 +0100
Subject: [PATCH] Support default binding mode on direct properties.

---
 src/Perspex.Base/DirectProperty.cs                  | 6 ++++--
 src/Perspex.Base/PerspexProperty.cs                 | 7 +++++--
 tests/Perspex.Base.UnitTests/DirectPropertyTests.cs | 6 +++++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/Perspex.Base/DirectProperty.cs b/src/Perspex.Base/DirectProperty.cs
index c926f28240..7ae19ec520 100644
--- a/src/Perspex.Base/DirectProperty.cs
+++ b/src/Perspex.Base/DirectProperty.cs
@@ -24,11 +24,13 @@ namespace Perspex
         /// <param name="name">The name of the property.</param>
         /// <param name="getter">Gets the current value of the property.</param>
         /// <param name="setter">Sets the value of the property. May be null.</param>
+        /// <param name="metadata">The property metadata.</param>
         public DirectProperty(
             string name,
             Func<TOwner, TValue> getter,
-            Action<TOwner, TValue> setter = null)
-            : base(name, typeof(TOwner), new PropertyMetadata())
+            Action<TOwner, TValue> setter,
+            PropertyMetadata metadata)
+            : base(name, typeof(TOwner), metadata)
         {
             Contract.Requires<ArgumentNullException>(getter != null);
 
diff --git a/src/Perspex.Base/PerspexProperty.cs b/src/Perspex.Base/PerspexProperty.cs
index 4c0b6fd724..8998627849 100644
--- a/src/Perspex.Base/PerspexProperty.cs
+++ b/src/Perspex.Base/PerspexProperty.cs
@@ -342,16 +342,19 @@ namespace Perspex
         /// <param name="name">The name of the property.</param>
         /// <param name="getter">Gets the current value of the property.</param>
         /// <param name="setter">Sets the value of the property.</param>
+        /// <param name="defaultBindingMode">The default binding mode for the property.</param>
         /// <returns>A <see cref="PerspexProperty{TValue}"/></returns>
         public static DirectProperty<TOwner, TValue> RegisterDirect<TOwner, TValue>(
             string name,
             Func<TOwner, TValue> getter,
-            Action<TOwner, TValue> setter = null)
+            Action<TOwner, TValue> setter = null,
+            BindingMode defaultBindingMode = BindingMode.OneWay)
                 where TOwner : IPerspexObject
         {
             Contract.Requires<ArgumentNullException>(name != null);
 
-            var result = new DirectProperty<TOwner, TValue>(name, getter, setter);
+            var metadata = new PropertyMetadata(defaultBindingMode);
+            var result = new DirectProperty<TOwner, TValue>(name, getter, setter, metadata);
             PerspexPropertyRegistry.Instance.Register(typeof(TOwner), result);
             return result;
         }
diff --git a/tests/Perspex.Base.UnitTests/DirectPropertyTests.cs b/tests/Perspex.Base.UnitTests/DirectPropertyTests.cs
index 68e1c62cf3..9e23e59f80 100644
--- a/tests/Perspex.Base.UnitTests/DirectPropertyTests.cs
+++ b/tests/Perspex.Base.UnitTests/DirectPropertyTests.cs
@@ -30,7 +30,11 @@ namespace Perspex.Base.UnitTests
         [Fact]
         public void IsDirect_Property_Returns_True()
         {
-            var target = new DirectProperty<Class1, string>("test", o => null);
+            var target = new DirectProperty<Class1, string>(
+                "test", 
+                o => null, 
+                null, 
+                new PropertyMetadata());
 
             Assert.True(target.IsDirect);
         }