Merge remote-tracking branch 'remotes/origin/master' into WpfDesignerPartialPanelSelectionHandler

Author: tbulle

data/templates/packages/Modernizr.2.5.3.nupkg

@@ -54,6 +54,7 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Design" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Drawing" />
     <Reference Include="System.Drawing.Design" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xaml">

data/templates/packages/jQuery.1.7.2.nupkg

@@ -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/FormsDesigner/Project/FormsDesigner.csproj

@@ -26,25 +26,25 @@
 
 namespace ICSharpCode.WpfDesign.Designer.Controls
 {
-	/// <summary>
-	/// Display height of the element.
-	/// </summary>
-	class HeightDisplay : Control
-	{
-		static HeightDisplay()
-		{
-			DefaultStyleKeyProperty.OverrideMetadata(typeof(HeightDisplay), new FrameworkPropertyMetadata(typeof(HeightDisplay)));
-		}
-	}
+    /// <summary>
+    /// Display height of the element.
+    /// </summary>
+    public class HeightDisplay : Control
+    {
+        static HeightDisplay()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(HeightDisplay), new FrameworkPropertyMetadata(typeof(HeightDisplay)));
+        }
+    }
 
-	/// <summary>
-	/// Display width of the element.
-	/// </summary>
-	class WidthDisplay : Control
-	{
-		static WidthDisplay()
-		{
-			DefaultStyleKeyProperty.OverrideMetadata(typeof(WidthDisplay), new FrameworkPropertyMetadata(typeof(WidthDisplay)));
-		}
-	}
+    /// <summary>
+    /// Display width of the element.
+    /// </summary>
+    public class WidthDisplay : Control
+    {
+        static WidthDisplay()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(WidthDisplay), new FrameworkPropertyMetadata(typeof(WidthDisplay)));
+        }
+    }
 }

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

@@ -64,14 +64,14 @@ void RunHitTest(Visual reference, Point point, HitTestFilterCallback filterCallb
 		HitTestFilterBehavior FilterHitTestInvisibleElements(DependencyObject potentialHitTestTarget)
 		{
 			UIElement element = potentialHitTestTarget as UIElement;
-						
+			
 			if (element != null) {
 				if (!(element.IsHitTestVisible && element.Visibility == Visibility.Visible)) {
 					return HitTestFilterBehavior.ContinueSkipSelfAndChildren;
 				}
 
 				var designItem = Context.Services.Component.GetDesignItem(element) as XamlDesignItem;
-			
+				
 				if (designItem != null && designItem.IsDesignTimeLocked) {
 					return HitTestFilterBehavior.ContinueSkipSelfAndChildren;
 				}			
@@ -109,14 +109,17 @@ 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;
 			hitTestElements.Clear();
 
 			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);
@@ -138,11 +141,11 @@ 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;
 
@@ -210,6 +213,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/Controls/SizeDisplay.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/DesignPanel.cs

@@ -33,7 +33,7 @@ namespace ICSharpCode.WpfDesign.Designer.Extensions
 	/// </summary>
 	[ExtensionServer(typeof(OnlyOneItemSelectedExtensionServer))]
 	[ExtensionFor(typeof (FrameworkElement))]
-	class QuickOperationMenuExtension : PrimarySelectionAdornerProvider
+	public class QuickOperationMenuExtension : PrimarySelectionAdornerProvider
 	{
 		private QuickOperationMenu _menu;
 		private KeyBinding _keyBinding;

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/ExtensionMethods.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/Extensions/QuickOperationMenuExtension.cs

@@ -40,10 +40,11 @@ public Outline()
 		}
 
 		public static readonly DependencyProperty RootProperty =
-			DependencyProperty.Register("Root", typeof(OutlineNode), typeof(Outline));
+			DependencyProperty.Register("Root", typeof(IOutlineNode), typeof(Outline));
 
-		public OutlineNode Root {
-			get { return (OutlineNode)GetValue(RootProperty); }
+		public IOutlineNode Root
+		{
+			get { return (IOutlineNode)GetValue(RootProperty); }
 			set { SetValue(RootProperty, value); }
 		}