Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-06-07 13:16:24 +00:00
parent 4bdbaf4a88
commit 966bba02bb
8776 changed files with 346420 additions and 149650 deletions

View File

@ -210,23 +210,23 @@ namespace System.Windows.Forms.Design
return false;
}
public virtual bool CanParent (ControlDesigner designer)
public virtual bool CanParent (ControlDesigner controlDesigner)
{
return CanParent (designer.Control);
return CanParent (controlDesigner.Control);
}
protected override void OnDragDrop (DragEventArgs e)
protected override void OnDragDrop (DragEventArgs de)
{
IUISelectionService selectionServ = this.GetService (typeof (IUISelectionService)) as IUISelectionService;
if (selectionServ != null) {
// once this is fired the parent control (parentcontroldesigner) will start getting dragover events.
//
Point location = this.SnapPointToGrid (this.Control.PointToClient (new Point (e.X, e.Y)));
Point location = this.SnapPointToGrid (this.Control.PointToClient (new Point (de.X, de.Y)));
selectionServ.DragDrop (false, this.Control, location.X, location.Y);
}
}
protected override void OnDragEnter (DragEventArgs e)
protected override void OnDragEnter (DragEventArgs de)
{
this.Control.Refresh ();
}
@ -236,16 +236,16 @@ namespace System.Windows.Forms.Design
this.Control.Refresh ();
}
protected override void OnDragOver (DragEventArgs e)
protected override void OnDragOver (DragEventArgs de)
{
IUISelectionService selectionServ = this.GetService (typeof (IUISelectionService)) as IUISelectionService;
if (selectionServ != null) {
// once ControlDesigner.MouseDragBegin is called this will start getting dragover events.
//
Point location = this.SnapPointToGrid (this.Control.PointToClient (new Point (e.X, e.Y)));
Point location = this.SnapPointToGrid (this.Control.PointToClient (new Point (de.X, de.Y)));
selectionServ.DragOver (this.Control, location.X, location.Y);
}
e.Effect = DragDropEffects.Move;
de.Effect = DragDropEffects.Move;
}
#endregion