Merge remote-tracking branch 'remotes/sd/master'

Author: jogibear9988

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

@@ -30,9 +30,11 @@ namespace ICSharpCode.WpfDesign.Designer.Extensions
 	/// Provides <see cref="IPlacementBehavior"/> behavior for <see cref="Canvas"/>.
 	/// </summary>
 	[ExtensionFor(typeof(Canvas), OverrideExtension=typeof(DefaultPlacementBehavior))]
-	public sealed class CanvasPlacementSupport : SnaplinePlacementBehavior
+	public class CanvasPlacementSupport : SnaplinePlacementBehavior
 	{
 		GrayOutDesignerExceptActiveArea grayOut;
+		FrameworkElement extendedComponent;
+		FrameworkElement extendedView;
 
 		static double GetCanvasProperty(UIElement element, DependencyProperty d)
 		{
@@ -48,6 +50,14 @@ static bool IsPropertySet(UIElement element, DependencyProperty d)
 			return element.ReadLocalValue(d) != DependencyProperty.UnsetValue;
 		}
 
+		protected override void OnInitialized()
+		{
+			base.OnInitialized();
+
+			extendedComponent = (FrameworkElement)ExtendedItem.Component;
+			extendedView = (FrameworkElement)this.ExtendedItem.View;
+		}
+		
 		public override void SetPosition(PlacementInformation info)
 		{
 			base.SetPosition(info);
@@ -58,7 +68,7 @@ public override void SetPosition(PlacementInformation info)
 
 			if (IsPropertySet(child, Canvas.RightProperty))
 			{
-				var newR = ((Canvas) ExtendedItem.Component).ActualWidth - newPosition.Right;
+				var newR = extendedComponent.ActualWidth - newPosition.Right;
 				if (newR != GetCanvasProperty(child, Canvas.RightProperty))
 					info.Item.Properties.GetAttachedProperty(Canvas.RightProperty).SetValue(newR);
 			}
@@ -70,7 +80,7 @@ public override void SetPosition(PlacementInformation info)
 
 			if (IsPropertySet(child, Canvas.BottomProperty))
 			{
-				var newB = ((Canvas)ExtendedItem.Component).ActualHeight - newPosition.Bottom;
+				var newB = extendedComponent.ActualHeight - newPosition.Bottom;
 				if (newB != GetCanvasProperty(child, Canvas.BottomProperty))
 					info.Item.Properties.GetAttachedProperty(Canvas.BottomProperty).SetValue(newB);
 			}
@@ -81,8 +91,7 @@ public override void SetPosition(PlacementInformation info)
 
 			if (info.Item == Services.Selection.PrimarySelection)
 			{
-				var cv = this.ExtendedItem.View as Canvas;
-				var b = new Rect(0, 0, cv.ActualWidth, cv.ActualHeight);
+				var b = new Rect(0, 0, extendedView.ActualWidth, extendedView.ActualHeight);
 				// only for primary selection:
 				if (grayOut != null)
 				{

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/OutlineView/DragTreeViewItem.cs

@@ -159,7 +159,10 @@ protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
 		protected override void OnMouseLeftButtonUp(MouseButtonEventArgs e)
 		{
 			base.OnMouseLeftButtonUp(e);
-			ParentTree.ItemMouseUp(this);
+			
+			if (ParentTree != null) {
+				ParentTree.ItemMouseUp(this);
+			}
 		}
 	}
 }

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/ExampleService.cs

@@ -67,5 +67,25 @@ protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)
 			// TODO: add this test, check for correct setting of NameScope
 			//TestHelperLog.Log("ExampleDependencyObject.OnPropertyChanged " + e.Property.Name);
 		}
+		
+		public static readonly DependencyProperty ExampleProperty = DependencyProperty.RegisterAttached(
+			"Example", typeof(string), typeof(ExampleDependencyObject)
+		);
+		
+		public static string GetExample(DependencyObject element)
+		{
+			TestHelperLog.Log("ExampleDependencyObject.GetExample");
+			return (string)element.GetValue(ExampleProperty);
+		}
+		
+		public static void SetExample(DependencyObject element, string value)
+		{
+			TestHelperLog.Log("ExampleDependencyObject.SetExample");
+			element.SetValue(ExampleProperty, value);
+		}
+	}
+	
+	public class DerivedExampleDependencyObject : ExampleDependencyObject
+	{
 	}
 }

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SimpleLoadTests.cs

@@ -418,5 +418,18 @@ public void ExampleClassObjectPropWithExplicitMarkupExtension2()
 </t:ExampleClass>
 			");
 		}
+		
+		[Test]
+		public void UsingAttachedPropertyOnDerivedClass()
+		{
+			TestLoading(@"
+<Window
+  xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
+  xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
+  xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
+  t:DerivedExampleDependencyObject.Example=""test"">
+</Window>
+			");
+		}
 	}
 }

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

@@ -478,6 +478,11 @@ internal static XamlPropertyInfo TryFindAttachedProperty(Type elementType, strin
 					return new XamlDependencyPropertyInfo((DependencyProperty)field.GetValue(null), true);
 				}
 			}
+			
+			if (elementType.BaseType != null) {
+				return TryFindAttachedProperty(elementType.BaseType, propertyName);
+			}
+			
 			return null;
 		}
 

src/AddIns/Misc/Reporting/Libraries/Irony.Interpreter.dll

@@ -0,0 +1,22 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.30324.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackagePrepApp", "PackagePrepApp\PackagePrepApp.csproj", "{6788F8CB-B7C4-4787-9D46-CAAB16F1E9DA}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{6788F8CB-B7C4-4787-9D46-CAAB16F1E9DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6788F8CB-B7C4-4787-9D46-CAAB16F1E9DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6788F8CB-B7C4-4787-9D46-CAAB16F1E9DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6788F8CB-B7C4-4787-9D46-CAAB16F1E9DA}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal