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

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

@@ -89,11 +89,7 @@ namespace ICSharpCode.WpfDesign.Designer.Extensions
 		public override void EnterContainer(PlacementOperation operation)
 		{
 			base.EnterContainer(operation);
-			foreach (var info in operation.PlacedItems) {
-				info.Item.Properties[FrameworkElement.MarginProperty].Reset();
-				info.Item.Properties[FrameworkElement.HorizontalAlignmentProperty].Reset();
-				info.Item.Properties[FrameworkElement.VerticalAlignmentProperty].Reset();
-			}
+			
 			_rectangle.Visibility = Visibility.Visible;
 		}
 

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

@@ -28,9 +28,9 @@ namespace ICSharpCode.WpfDesign
 	{
 		/// <summary>
 		/// The designer rounds bounds to this number of digits to avoid floating point errors.
-		/// Value: 1
+		/// Value: 0
 		/// </summary>
-		public const int BoundsPrecision = 1;
+		public const int BoundsPrecision = 0;
 		
 		Rect originalBounds, bounds;
 		readonly DesignItem item;

src/Setup/Files.wxs

@@ -1342,6 +1342,9 @@
 									<Component Guid="E89BBA3D-D267-4E4F-8DA7-E38E864C4317" Id="WpfDesignAddin" DiskId="1">
 										<File Source="..\..\AddIns\DisplayBindings\WpfDesign\WpfDesign.addin" Name="WpfDesign.addin" Id="WpfDesign.addin" KeyPath="yes" />
 									</Component>
+									<Component Id="XceedWpfToolkitDll" Guid="21814C24-5CB8-4BBD-BAA7-2AEBD4CBF25D" DiskId="1">
+										<File Id="Xceed.Wpf.Toolkit.dll" Name="Xceed.Wpf.Toolkit.dll" Source="..\..\AddIns\DisplayBindings\WpfDesign\Xceed.Wpf.Toolkit.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="Xceed.Wpf.Toolkit.dll" AssemblyManifest="Xceed.Wpf.Toolkit.dll" />
+									</Component>
 								</Directory>
 								<Directory Id="Data" Name="Data">
 									<Component Guid="16E65D48-658D-4C6B-BCCB-9B5450727CFD" Id="ICSharpCodeDataAddin" DiskId="1">

src/Setup/Setup.wxs

@@ -436,6 +436,7 @@
 				<ComponentRef Id="ICSharpCodeWpfDesignDll"/>
 				<ComponentRef Id="ICSharpCodeWpfDesignXamlDomDll"/>
 				<ComponentRef Id="WpfDesignAddin"/>
+				<ComponentRef Id="XceedWpfToolkitDll"/>
 				
 				<ComponentRef Id="ICSharpCodeDataAddin"/>
 				<ComponentRef Id="ICSharpCodeDataAddinDll"/>