Merge branch 'WpfDesignerKeyboardMove'

Author: tbulle

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/DesignPanel.cs

@@ -60,20 +60,20 @@ 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;
+				}
+				
 			}
 
-			}
-						
 			return HitTestFilterBehavior.Continue;
 		}
 
@@ -161,6 +161,9 @@ public void HitTest(Point mousePosition, bool testAdorners, bool testDesignSurfa
 		DesignContext _context;
 		readonly EatAllHitTestRequests _eatAllHitTestRequests;
 		readonly AdornerLayer _adornerLayer;
+		PlacementOperation _currentOperation;
+		bool _moving = false;
+		int _movingDistance;
 
 		public DesignPanel()
 		{
@@ -328,6 +331,10 @@ private void DesignPanel_KeyUp(object sender, KeyEventArgs e)
 		{
 			if (e.Key == Key.Left || e.Key == Key.Right || e.Key == Key.Up || e.Key == Key.Down)
 			{
+				if (_currentOperation != null)
+					_currentOperation.Commit();
+				_currentOperation = null;
+				_moving = false;
 				e.Handled = true;
 			}
 		}
@@ -338,14 +345,19 @@ void DesignPanel_KeyDown(object sender, KeyEventArgs e)
 			{
 				e.Handled = true;
 
-				var placementOp = PlacementOperation.Start(Context.Services.Selection.SelectedItems, PlacementType.Move);
-
-
-				var dx1 = (e.Key == Key.Left) ? Keyboard.IsKeyDown(Key.LeftShift) ? -10 : -1 : 0;
-				var dy1 = (e.Key == Key.Up) ? Keyboard.IsKeyDown(Key.LeftShift) ? -10 : -1 : 0;
-				var dx2 = (e.Key == Key.Right) ? Keyboard.IsKeyDown(Key.LeftShift) ? 10 : 1 : 0;
-				var dy2 = (e.Key == Key.Down) ? Keyboard.IsKeyDown(Key.LeftShift) ? 10 : 1 : 0;
-				foreach (PlacementInformation info in placementOp.PlacedItems)
+				if (!_moving)
+				{
+					_currentOperation = PlacementOperation.Start(Context.Services.Selection.SelectedItems, PlacementType.Move);
+					_moving = true;
+					_movingDistance = 0;
+				}
+				
+				var dx1 = (e.Key == Key.Left) ? Keyboard.IsKeyDown(Key.LeftShift) ? _movingDistance - 10 : _movingDistance - 1 : 0;
+				var dy1 = (e.Key == Key.Up) ? Keyboard.IsKeyDown(Key.LeftShift) ? _movingDistance - 10 : _movingDistance - 1 : 0;
+				var dx2 = (e.Key == Key.Right) ? Keyboard.IsKeyDown(Key.LeftShift) ? _movingDistance + 10 : _movingDistance + 1 : 0;
+				var dy2 = (e.Key == Key.Down) ? Keyboard.IsKeyDown(Key.LeftShift) ? _movingDistance + 10 : _movingDistance + 1 : 0;
+				
+				foreach (PlacementInformation info in _currentOperation.PlacedItems)
 				{
 					if (!Keyboard.IsKeyDown(Key.LeftCtrl))
 					{
@@ -361,9 +373,11 @@ void DesignPanel_KeyDown(object sender, KeyEventArgs e)
 						                       info.OriginalBounds.Width + dx1 + dx2,
 						                       info.OriginalBounds.Height + dy1 + dy2);
 					}
-
-					placementOp.CurrentContainerBehavior.SetPosition(info);
+					
+					_currentOperation.CurrentContainerBehavior.SetPosition(info);
 				}
+
+				_movingDistance = (dx1 + dx2 + dy1 + dy2);
 			}
 		}