From f071ff561888b0c409678bc1cd4a8dd494a12084 Mon Sep 17 00:00:00 2001 From: gumme Date: Wed, 2 Jul 2014 14:19:27 +0200 Subject: [PATCH 1/3] Modified precision for element positioning and boundaries to use 0 decimals. --- .../WpfDesign/WpfDesign/Project/PlacementInformation.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/PlacementInformation.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/PlacementInformation.cs index 34832763b3..4bae5b1140 100644 --- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/PlacementInformation.cs +++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/PlacementInformation.cs @@ -28,9 +28,9 @@ namespace ICSharpCode.WpfDesign { /// /// The designer rounds bounds to this number of digits to avoid floating point errors. - /// Value: 1 + /// Value: 0 /// - public const int BoundsPrecision = 1; + public const int BoundsPrecision = 0; Rect originalBounds, bounds; readonly DesignItem item; From 43aecafb420180875c12c6ad23e49c5e0ffc65ba Mon Sep 17 00:00:00 2001 From: gumme Date: Wed, 2 Jul 2014 15:44:16 +0200 Subject: [PATCH 2/3] StackPanel no longer removes properties that are used in the panel. --- .../Project/Extensions/StackPanelPlacementSupport.cs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/StackPanelPlacementSupport.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/StackPanelPlacementSupport.cs index 1656e5c0ea..3180cbb3a4 100644 --- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/StackPanelPlacementSupport.cs +++ b/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; } From f2568c1f8253f55863ab7165a633bf7d9d09db5b Mon Sep 17 00:00:00 2001 From: Matt Ward Date: Thu, 3 Jul 2014 20:05:00 +0100 Subject: [PATCH 3/3] Fix ReflectionTypeLoadException in WPF designer. The Xceed.Wpf.Toolkit.dll file needed by the WPF designer was not included in the installer. --- src/Setup/Files.wxs | 3 +++ src/Setup/Setup.wxs | 1 + 2 files changed, 4 insertions(+) diff --git a/src/Setup/Files.wxs b/src/Setup/Files.wxs index c9aaef23c8..d23a95d9fc 100644 --- a/src/Setup/Files.wxs +++ b/src/Setup/Files.wxs @@ -1342,6 +1342,9 @@ + + + diff --git a/src/Setup/Setup.wxs b/src/Setup/Setup.wxs index 1633ffb543..d32bd32c2c 100644 --- a/src/Setup/Setup.wxs +++ b/src/Setup/Setup.wxs @@ -436,6 +436,7 @@ +