|
|
|
@ -340,8 +340,6 @@ namespace Avalonia.Controls |
|
|
|
|
|
|
|
if (OwningGrid != null && OwningGrid.ColumnHeaders != null) |
|
|
|
{ |
|
|
|
args.Pointer.Capture(this); |
|
|
|
|
|
|
|
_dragMode = DragMode.MouseDown; |
|
|
|
_frozenColumnsWidth = OwningGrid.ColumnsInternal.GetVisibleFrozenEdgedColumnsWidth(); |
|
|
|
_lastMousePositionHeaders = this.Translate(OwningGrid.ColumnHeaders, mousePosition); |
|
|
|
@ -413,8 +411,9 @@ namespace Avalonia.Controls |
|
|
|
} |
|
|
|
|
|
|
|
//TODO DragEvents
|
|
|
|
internal void OnMouseMove(ref bool handled, Point mousePosition, Point mousePositionHeaders) |
|
|
|
internal void OnMouseMove(PointerEventArgs args, Point mousePosition, Point mousePositionHeaders) |
|
|
|
{ |
|
|
|
var handled = args.Handled; |
|
|
|
if (handled || OwningGrid == null || OwningGrid.ColumnHeaders == null) |
|
|
|
{ |
|
|
|
return; |
|
|
|
@ -438,7 +437,10 @@ namespace Avalonia.Controls |
|
|
|
} |
|
|
|
|
|
|
|
_lastMousePositionHeaders = mousePositionHeaders; |
|
|
|
|
|
|
|
|
|
|
|
if (args.Pointer.Captured != this) |
|
|
|
args.Pointer.Capture(this); |
|
|
|
|
|
|
|
SetDragCursor(mousePosition); |
|
|
|
} |
|
|
|
|
|
|
|
@ -506,8 +508,7 @@ namespace Avalonia.Controls |
|
|
|
Point mousePosition = e.GetPosition(this); |
|
|
|
Point mousePositionHeaders = e.GetPosition(OwningGrid.ColumnHeaders); |
|
|
|
|
|
|
|
bool handled = false; |
|
|
|
OnMouseMove(ref handled, mousePosition, mousePositionHeaders); |
|
|
|
OnMouseMove(e, mousePosition, mousePositionHeaders); |
|
|
|
} |
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|