Merge remote-tracking branch 'remotes/origin/WpfDesignerControlExtensions'

Author: gumme

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/ResizeThumb.cs

@@ -45,7 +45,7 @@ public static readonly DependencyProperty IsPrimarySelectionProperty
 		public static readonly DependencyProperty ResizeThumbVisibleProperty
 			= DependencyProperty.Register("ResizeThumbVisible", typeof(bool), typeof(ResizeThumb), new FrameworkPropertyMetadata(true));
 
-		internal PlacementAlignment Alignment;
+		public PlacementAlignment Alignment;
 
 		static ResizeThumb()
 		{

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/SizeDisplay.cs

@@ -29,7 +29,7 @@ namespace ICSharpCode.WpfDesign.Designer.Controls
     /// <summary>
     /// Display height of the element.
     /// </summary>
-    class HeightDisplay : Control
+    public class HeightDisplay : Control
     {
         static HeightDisplay()
         {
@@ -40,7 +40,7 @@ static HeightDisplay()
     /// <summary>
     /// Display width of the element.
     /// </summary>
-    class WidthDisplay : Control
+    public class WidthDisplay : Control
     {
         static WidthDisplay()
         {

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/ExtensionMethods.cs

@@ -31,6 +31,19 @@ namespace ICSharpCode.WpfDesign.Designer
 {
 	public static class ExtensionMethods
 	{
+		
+		public static bool AnyIsInNamespace(this Type type, string namespacestr)
+        {
+            Type t = type;
+            while (t!=null)
+            {
+                if (t.Namespace.Equals(namespacestr))
+                    return true;
+                t = t.BaseType;
+            }
+            return false;
+        }
+		
 		public static double Coerce(this double value, double min, double max)
 		{
 			return Math.Max(Math.Min(value, max), min);

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/QuickOperationMenuExtension.cs

@@ -32,7 +32,7 @@ namespace ICSharpCode.WpfDesign.Designer.Extensions
 	/// Extends the Quick operation menu for the designer.
 	/// </summary>
 	[ExtensionFor(typeof (FrameworkElement))]
-	class QuickOperationMenuExtension : PrimarySelectionAdornerProvider
+	public class QuickOperationMenuExtension : PrimarySelectionAdornerProvider
 	{
 		private QuickOperationMenu _menu;
 		private KeyBinding _keyBinding;

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/SizeDisplayExtension.cs

@@ -33,7 +33,7 @@ namespace ICSharpCode.WpfDesign.Designer.Extensions
 	/// Display Height/Width on the primary selection
 	/// </summary>
 	[ExtensionFor(typeof(UIElement))]
-	class SizeDisplayExtension : PrimarySelectionAdornerProvider
+	public class SizeDisplayExtension : PrimarySelectionAdornerProvider
 	{
 		HeightDisplay _heightDisplay;
 		WidthDisplay _widthDisplay;

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

@@ -20,6 +20,7 @@
 using System;
 using System.Diagnostics;
 using System.Windows.Input;
+using System.Windows.Controls;
 using ICSharpCode.WpfDesign.Adorners;
 using ICSharpCode.WpfDesign.Designer.Controls;
 
@@ -176,7 +177,12 @@ internal static bool AddItemWithDefaultSize(DesignItem container, DesignItem cre
 
 		internal static bool AddItemWithCustomSize(DesignItem container, DesignItem createdItem, Point position, Size size)
 		{
-			
+			bool b = createdItem.View.GetType().AnyIsInNamespace("System.Windows.Shapes");
+            if (b) 
+            {
+                createdItem.View.SetValue(Canvas.LeftProperty, position.X);
+                createdItem.View.SetValue(Canvas.TopProperty, position.Y);
+            }
 			PlacementOperation operation = PlacementOperation.TryStartInsertNewComponents(
 				container,
 				new DesignItem[] { createdItem },

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

@@ -17,6 +17,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
+using System.Collections.Generic;
 
 namespace ICSharpCode.WpfDesign.Extensions
 {
@@ -28,6 +29,7 @@ public sealed class ExtensionForAttribute : Attribute
 	{
 		Type _designedItemType;
 		Type _overrideExtension;
+		List<Type> _overrideExtensions = new List<Type>();
 
 		/// <summary>
 		/// Gets the type of the item that is designed using this extension.
@@ -36,6 +38,18 @@ public Type DesignedItemType {
 			get { return _designedItemType; }
 		}
 
+		/// <summary>
+        /// Gets/Sets the types of another extension that this extension is overriding.
+        /// </summary>
+        public Type[] OverrideExtensions
+        {
+            get { return _overrideExtensions.ToArray(); }
+            set
+            {
+                _overrideExtensions.AddRange(value);
+            }
+        }
+		
 		/// <summary>
 		/// Gets/Sets the type of another extension that this extension is overriding.
 		/// </summary>
@@ -47,6 +61,8 @@ public Type OverrideExtension {
 					if (!typeof(Extension).IsAssignableFrom(value)) {
 						throw new ArgumentException("OverrideExtension must specify the type of an Extension.");
 					}
+					if(!_overrideExtensions.Contains(value))
+                        _overrideExtensions.Add(value);
 				}
 			}
 		}

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

@@ -64,13 +64,19 @@ sealed class ExtensionEntry
 		{
 			internal readonly Type ExtensionType;
 			internal readonly ExtensionServer Server;
-			internal readonly Type OverriddenExtensionType;
+			internal readonly List<Type> OverriddenExtensionTypes = new List<Type>();
 
 			public ExtensionEntry(Type extensionType, ExtensionServer server, Type overriddenExtensionType)
 			{
 				this.ExtensionType = extensionType;
 				this.Server = server;
-				this.OverriddenExtensionType = overriddenExtensionType;
+				this.OverriddenExtensionTypes.Add(overriddenExtensionType);
+			}
+			public ExtensionEntry(Type extensionType, ExtensionServer server, List<Type> overriddenExtensionTypes)
+			{
+				this.ExtensionType = extensionType;
+				this.Server = server;
+				this.OverriddenExtensionTypes= overriddenExtensionTypes;
 			}
 		}
 
@@ -87,23 +93,18 @@ void AddExtensionEntry(Type extendedItemType, ExtensionEntry entry)
 
 		List<ExtensionEntry> GetExtensionEntries(Type extendedItemType)
 		{
-			List<ExtensionEntry> result;
-			if (extendedItemType.BaseType != null)
-				result = GetExtensionEntries(extendedItemType.BaseType);
-			else
-				result = new List<ExtensionEntry>();
-			
-			List<ExtensionEntry> list;
-			if (_extensions.TryGetValue(extendedItemType, out list)) {
-				foreach (ExtensionEntry entry in list) {
-					if (entry.OverriddenExtensionType != null) {
-						result.RemoveAll(delegate(ExtensionEntry oldEntry) {
-						                 	return oldEntry.ExtensionType == entry.OverriddenExtensionType;
-						                 });
-					}
+			List<ExtensionEntry> result = new List<ExtensionEntry>();
+			List<Type> overriddenExtensions = new List<Type>();
+			IEnumerable<ExtensionEntry> ie = _extensions.Where(x => x.Key.IsAssignableFrom(extendedItemType)).SelectMany(x => x.Value);
+			foreach (ExtensionEntry entry in ie) {
+				if (!overriddenExtensions.Contains(entry.ExtensionType)) {
+					overriddenExtensions.AddRange(entry.OverriddenExtensionTypes);
+
+					result.RemoveAll(x => overriddenExtensions.Contains(x.ExtensionType));
 					result.Add(entry);
 				}
 			}
+			
 			return result;
 		}