Changes to make reverse cloning possible

Author: tbulle

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Services/CreateComponentTool.cs

@@ -152,7 +152,7 @@ void designPanel_DragLeave(object sender, DragEventArgs e)
 		protected virtual DesignItem CreateItem(DesignContext context)
 		{
 			object newInstance = context.Services.ExtensionManager.CreateInstanceWithCustomInstanceFactory(componentType, null);
-			DesignItem item = context.Services.Component.RegisterComponentForDesigner(newInstance);
+			DesignItem item = context.Services.Component.RegisterComponentForDesigner(newInstance, componentType);
 			changeGroup = item.OpenGroup("Drop Control");
 			context.Services.ExtensionManager.ApplyDefaultInitializers(item);
 			return item;

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Xaml/XamlComponentService.cs

@@ -21,7 +21,7 @@
 using System.Runtime.CompilerServices;
 using System.Windows.Markup;
 using System.Windows;
-
+using ICSharpCode.WpfDesign.Extensions;
 using ICSharpCode.WpfDesign.XamlDom;
 
 namespace ICSharpCode.WpfDesign.Designer.Xaml
@@ -68,15 +68,18 @@ public DesignItem GetDesignItem(object component)
 			return site;
 		}
 
-		public DesignItem RegisterComponentForDesigner(object component)
+		public DesignItem RegisterComponentForDesigner(object component, Type basetype = null)
 		{
 			if (component == null) {
 				component = new NullExtension();
 			} else if (component is Type) {
 				component = new TypeExtension((Type)component);
 			}
-			
-			XamlDesignItem item = new XamlDesignItem(_context.Document.CreateObject(component), _context);
+
+			object baseobject = basetype != null && component.GetType()!=basetype ? CustomInstanceFactory.CreateObjectInstance(basetype, null) : null;
+			XamlObject xamlobj = _context.Document.CreateObject(component, baseobject);
+
+			XamlDesignItem item = new XamlDesignItem(xamlobj, _context);
 			_sites.Add(component, item);
 			if (ComponentRegistered != null) {
 				ComponentRegistered(this, new DesignItemEventArgs(item));

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlDocument.cs

@@ -158,9 +158,14 @@ internal void ParseComplete(XamlObject rootElement)
 		/// <summary>
 		/// Create an XamlObject from the instance.
 		/// </summary>
-		public XamlObject CreateObject(object instance)
+		public XamlObject CreateObject(object instance, object baseobject=null)
 		{
-			return (XamlObject)CreatePropertyValue(instance, null);
+			object obj = instance;
+			if (baseobject != null && instance.GetType() != baseobject.GetType())
+				obj = baseobject;
+			XamlObject xamlobj = (XamlObject)CreatePropertyValue(obj, null);
+			xamlobj.Instance = instance;
+			return xamlobj;
 		}
 
 		/// <summary>

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlObject.cs

@@ -287,6 +287,7 @@ public XamlDocument OwnerDocument {
 		/// </summary>
 		public object Instance {
 			get { return instance; }
+			internal set { instance = value; }
 		}
 
 		/// <summary>

src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/Extensions/CustomInstanceFactory.cs

@@ -48,7 +48,18 @@ protected CustomInstanceFactory()
 		/// <summary>
 		/// Creates an instance of the specified type, passing the specified arguments to its constructor.
 		/// </summary>
+		/// <param name="type"></param>
+		/// <param name="arguments"></param>
+		/// <returns></returns>
 		public virtual object CreateInstance(Type type, params object[] arguments)
+		{
+			return CreateObjectInstance(type, arguments);
+		}
+
+		/// <summary>
+		/// Creates an instance of the specified type, passing the specified arguments to its constructor.
+		/// </summary>
+		public static object CreateObjectInstance(Type type, params object[] arguments)
 		{
 			var instance = Activator.CreateInstance(type, arguments);
 			var uiElement = instance as UIElement;

src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/Services.cs

@@ -122,7 +122,7 @@ public interface IComponentService
 		DesignItem GetDesignItem(object component);
 
 		/// <summary>Registers a component for usage in the designer.</summary>
-		DesignItem RegisterComponentForDesigner(object component);
+		DesignItem RegisterComponentForDesigner(object component, Type basetype=null);
 
 		/// <summary>Event raised whenever a component is registered</summary>
 		event EventHandler<DesignItemEventArgs> ComponentRegistered;