|
|
|
@ -147,6 +147,9 @@ namespace ICSharpCode.WpfDesign.Designer
@@ -147,6 +147,9 @@ namespace ICSharpCode.WpfDesign.Designer
|
|
|
|
|
}; |
|
|
|
|
_eatAllHitTestRequests.AllowDrop = true; |
|
|
|
|
_adornerLayer = new AdornerLayer(this); |
|
|
|
|
|
|
|
|
|
this.PreviewKeyUp += DesignPanel_KeyUp; |
|
|
|
|
this.PreviewKeyDown += DesignPanel_KeyDown; |
|
|
|
|
} |
|
|
|
|
#endregion
|
|
|
|
|
|
|
|
|
@ -279,6 +282,49 @@ namespace ICSharpCode.WpfDesign.Designer
@@ -279,6 +282,49 @@ namespace ICSharpCode.WpfDesign.Designer
|
|
|
|
|
} |
|
|
|
|
#endregion
|
|
|
|
|
|
|
|
|
|
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) |
|
|
|
|
{ |
|
|
|
|
e.Handled = true; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
void DesignPanel_KeyDown(object sender, KeyEventArgs e) |
|
|
|
|
{ |
|
|
|
|
if (e.Key == Key.Left || e.Key == Key.Right || e.Key == Key.Up || e.Key == Key.Down) |
|
|
|
|
{ |
|
|
|
|
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 (!Keyboard.IsKeyDown(Key.LeftCtrl)) |
|
|
|
|
{ |
|
|
|
|
info.Bounds = new Rect(info.OriginalBounds.Left + dx1 + dx2, |
|
|
|
|
info.OriginalBounds.Top + dy1 + dy2, |
|
|
|
|
info.OriginalBounds.Width, |
|
|
|
|
info.OriginalBounds.Height); |
|
|
|
|
} |
|
|
|
|
else |
|
|
|
|
{ |
|
|
|
|
info.Bounds = new Rect(info.OriginalBounds.Left, |
|
|
|
|
info.OriginalBounds.Top, |
|
|
|
|
info.OriginalBounds.Width + dx1 + dx2, |
|
|
|
|
info.OriginalBounds.Height + dy1 + dy2); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
placementOp.CurrentContainerBehavior.SetPosition(info); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
protected override void OnQueryCursor(QueryCursorEventArgs e) |
|
|
|
|
{ |
|
|
|
|
base.OnQueryCursor(e); |
|
|
|
|