Merge remote-tracking branch 'origin/WpfDesignerPropGrid'

Author: tbulle

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

@@ -86,12 +86,15 @@ public void HitTest(Point mousePosition, bool testAdorners, bool testDesignSurfa
 				return;
 			}
 			// First try hit-testing on the adorner layer.
-			
+
 			bool continueHitTest = true;
-			
+
+			HitTestFilterCallback filterBehavior = CustomHitTestFilterBehavior ?? FilterHitTestInvisibleElements;
+			CustomHitTestFilterBehavior = null;
 			if (testAdorners) {
+
 				RunHitTest(
-					_adornerLayer, mousePosition, FilterHitTestInvisibleElements,
+					_adornerLayer, mousePosition, filterBehavior,
 					delegate(HitTestResult result) {
 						if (result != null && result.VisualHit != null && result.VisualHit is Visual) {
 							DesignPanelHitTestResult customResult = new DesignPanelHitTestResult((Visual)result.VisualHit);
@@ -110,14 +113,14 @@ public void HitTest(Point mousePosition, bool testAdorners, bool testDesignSurfa
 						}
 					});
 			}
-			
+
 			if (continueHitTest && testDesignSurface) {
 				RunHitTest(
-					this.Child, mousePosition, FilterHitTestInvisibleElements,
+					this.Child, mousePosition, filterBehavior,
 					delegate(HitTestResult result) {
 						if (result != null && result.VisualHit != null && result.VisualHit is Visual) {
 							DesignPanelHitTestResult customResult = new DesignPanelHitTestResult((Visual)result.VisualHit);
-							
+
 							ViewService viewService = _context.Services.View;
 							DependencyObject obj = result.VisualHit;
 							while (obj != null) {
@@ -165,6 +168,8 @@ public DesignPanel()
 
 		#region Properties
 
+		//Set custom HitTestFilterCallbak
+		public HitTestFilterCallback CustomHitTestFilterBehavior { get; set; }
 		/// <summary>
 		/// Gets/Sets the design context.
 		/// </summary>

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

@@ -45,7 +45,7 @@ public PropertyGrid()
 		public CategoriesCollection Categories { get; private set; }
 		public PropertyNodeCollection Events { get; private set; }
 
-		public EventHandler AggregatePropertiesUpdated;
+		public EventHandler AggregatePropertiesUpdated { get; set; }
 
 		private PropertyGridGroupMode _groupMode;
 

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

@@ -142,6 +142,12 @@ protected virtual DesignItem CreateItem(DesignContext context)
 			return item;
 		}
 
+		public static bool AddItemWithCustomSizePosition(DesignItem container, Type createdItem, Size size, Point position)
+		{
+			CreateComponentTool cct = new CreateComponentTool(createdItem);
+			return AddItemWithCustomSize(container, cct.CreateItem(container.Context), position, size);
+		}
+		
 		public static bool AddItemWithDefaultSize(DesignItem container, Type createdItem, Size size)
 		{
 			CreateComponentTool cct = new CreateComponentTool(createdItem);

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

@@ -3,7 +3,7 @@
 
 using System;
 using System.Windows.Input;
-
+using System.Windows.Media;
 namespace ICSharpCode.WpfDesign.Designer.Services
 {
 	// See IToolService for description.
@@ -22,6 +22,11 @@ public DefaultToolService(DesignContext context)
 				});
 		}
 
+		public HitTestFilterCallback DesignPanelHitTestFilterCallback
+		{
+			set{ _designPanel.CustomHitTestFilterBehavior = value; }
+		}
+		
 		public void Dispose()
 		{
 			if (_designPanel != null) {

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

@@ -6,6 +6,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
+using System.Windows.Media;
 
 using ICSharpCode.WpfDesign.Adorners;
 
@@ -38,6 +39,10 @@ public interface ITool
 	/// </summary>
 	public interface IToolService
 	{
+		/// <summary>
+		/// Set custom HitTestFilterCallback for DesignPanel
+		/// </summary>
+		HitTestFilterCallback DesignPanelHitTestFilterCallback{ set; }
 		/// <summary>
 		/// Gets the 'pointer' tool.
 		/// The pointer tool is the default tool for selecting and moving elements.
@@ -62,6 +67,10 @@ public interface IToolService
 	public interface IDesignPanel : IInputElement
 	{
 		/// <summary>
+        /// Set a custom filter callback so that any element can be filtered out
+        /// </summary>
+        HitTestFilterCallback CustomHitTestFilterBehavior { get; set; }
+		/// <summary>
 		/// Gets the design context used by the DesignPanel.
 		/// </summary>
 		DesignContext Context { get; }