From 82240033dc12d476deb333cff99f9239abb06662 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Pedro?= <jpedrolmail@gmail.com>
Date: Wed, 16 Sep 2020 20:09:52 +0100
Subject: [PATCH] Changed property copy constructors to require same property
 type.

---
 src/Avalonia.Base/AvaloniaProperty`1.cs | 23 +++++++++++++++++++----
 src/Avalonia.Base/DirectPropertyBase.cs | 17 ++++++++++++++++-
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/src/Avalonia.Base/AvaloniaProperty`1.cs b/src/Avalonia.Base/AvaloniaProperty`1.cs
index 7480d9c9c5..d5549e979b 100644
--- a/src/Avalonia.Base/AvaloniaProperty`1.cs
+++ b/src/Avalonia.Base/AvaloniaProperty`1.cs
@@ -31,18 +31,33 @@ namespace Avalonia
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="AvaloniaProperty"/> class.
+        /// Initializes a new instance of the <see cref="AvaloniaProperty{TValue}"/> class.
+        /// </summary>
+        /// <param name="source">The property to copy.</param>
+        /// <param name="ownerType">The new owner type.</param>
+        /// <param name="metadata">Optional overridden metadata.</param>
+        [Obsolete("Use constructor with AvaloniaProperty<TValue> instead.", true)]
+        protected AvaloniaProperty(
+            AvaloniaProperty source,
+            Type ownerType,
+            PropertyMetadata metadata)
+            : this(source as AvaloniaProperty<TValue> ?? throw new InvalidOperationException(), ownerType, metadata)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AvaloniaProperty{TValue}"/> class.
         /// </summary>
         /// <param name="source">The property to copy.</param>
         /// <param name="ownerType">The new owner type.</param>
         /// <param name="metadata">Optional overridden metadata.</param>
         protected AvaloniaProperty(
-            AvaloniaProperty source, 
-            Type ownerType, 
+            AvaloniaProperty<TValue> source,
+            Type ownerType,
             PropertyMetadata metadata)
             : base(source, ownerType, metadata)
         {
-            _changed = source is AvaloniaProperty<TValue> p ? p._changed : new Subject<AvaloniaPropertyChangedEventArgs<TValue>>();
+            _changed = source._changed;
         }
 
         /// <summary>
diff --git a/src/Avalonia.Base/DirectPropertyBase.cs b/src/Avalonia.Base/DirectPropertyBase.cs
index dbc2625b86..a2f113adb7 100644
--- a/src/Avalonia.Base/DirectPropertyBase.cs
+++ b/src/Avalonia.Base/DirectPropertyBase.cs
@@ -32,15 +32,30 @@ namespace Avalonia
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="AvaloniaProperty"/> class.
+        /// Initializes a new instance of the <see cref="DirectPropertyBase{TValue}"/> class.
         /// </summary>
         /// <param name="source">The property to copy.</param>
         /// <param name="ownerType">The new owner type.</param>
         /// <param name="metadata">Optional overridden metadata.</param>
+        [Obsolete("Use constructor with DirectPropertyBase<TValue> instead.", true)]
         protected DirectPropertyBase(
             AvaloniaProperty source,
             Type ownerType,
             PropertyMetadata metadata)
+            : this(source as DirectPropertyBase<TValue> ?? throw new InvalidOperationException(), ownerType, metadata)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DirectPropertyBase{TValue}"/> class.
+        /// </summary>
+        /// <param name="source">The property to copy.</param>
+        /// <param name="ownerType">The new owner type.</param>
+        /// <param name="metadata">Optional overridden metadata.</param>
+        protected DirectPropertyBase(
+            DirectPropertyBase<TValue> source,
+            Type ownerType,
+            PropertyMetadata metadata)
             : base(source, ownerType, metadata)
         {
         }