From 56ee23ea8dcc2758a3a0d98513f04dfb6ed4106f Mon Sep 17 00:00:00 2001
From: gumme <gumme@server.fake>
Date: Thu, 4 Dec 2014 21:19:51 +0100
Subject: [PATCH] Fixed so resize operation by using ctrl + arrow is working
 again, and also handles the case if the user releases ctrl while still
 pressing an arrow.

---
 .../WpfDesign.Designer/Project/DesignPanel.cs | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/DesignPanel.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/DesignPanel.cs
index d13f23dcc8..d15d9fc93c 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/DesignPanel.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/DesignPanel.cs
@@ -389,10 +389,17 @@ namespace ICSharpCode.WpfDesign.Designer
 			if (e.Key == Key.Left || e.Key == Key.Right || e.Key == Key.Up || e.Key == Key.Down) {
 				e.Handled = true;
 				
+				PlacementType placementType = Keyboard.IsKeyDown(Key.LeftCtrl) ? PlacementType.Resize : PlacementType.Move;
+				
+				if (placementOp != null && placementOp.Type != placementType) {
+					placementOp.Commit();
+					placementOp = null;
+				}
+				
 				if (placementOp == null) {
 					dx = 0;
 					dy = 0;
-					placementOp = PlacementOperation.Start(Context.Services.Selection.SelectedItems, PlacementType.Move);
+					placementOp = PlacementOperation.Start(Context.Services.Selection.SelectedItems, placementType);
 				}
 				
 				switch (e.Key) {
@@ -414,17 +421,17 @@ namespace ICSharpCode.WpfDesign.Designer
 				{
 					var bounds = info.OriginalBounds;
 					
-					if (!Keyboard.IsKeyDown(Key.LeftCtrl)) {
+					if (placementType == PlacementType.Move) {
 						info.Bounds = new Rect(bounds.Left + dx,
 						                       bounds.Top + dy,
 						                       bounds.Width,
 						                       bounds.Height);
-					} else {
-						if (info.OriginalBounds.Width + dx >= 0 && info.OriginalBounds.Height + dy >= 0)  {
-							info.Bounds = new Rect(info.OriginalBounds.Left,
-							                       info.OriginalBounds.Top,
-							                       info.OriginalBounds.Width + dx,
-							                       info.OriginalBounds.Height + dy);
+					} else if (placementType == PlacementType.Resize) {
+						if (bounds.Width + dx >= 0 && bounds.Height + dy >= 0)  {
+							info.Bounds = new Rect(bounds.Left,
+							                       bounds.Top,
+							                       bounds.Width + dx,
+							                       bounds.Height + dy);
 						}
 					}