Merge pull request #157 from AvaloniaUI/fixes/row-drop-event

Correctly raise the RowDrop event.
AvaloniaUI · Mar 28, 2023 · a7d1fc6 · a7d1fc6
1 parent a9e59bb
commit a7d1fc6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/Avalonia.Controls.TreeDataGrid/TreeDataGrid.cs b/src/Avalonia.Controls.TreeDataGrid/TreeDataGrid.cs
@@ -583,7 +583,7 @@ private void OnDragOver(DragEventArgs e)
 
             if (route.HasHandlers)
             {
-                var ev = new TreeDataGridRowDragEventArgs(row, e);
+                var ev = new TreeDataGridRowDragEventArgs(RowDragOverEvent, row, e);
                 ev.Position = adorner;
                 RaiseEvent(ev);
                 adorner = ev.Position;
@@ -618,7 +618,7 @@ private void OnDrop(DragEventArgs e)
 
             if (route.HasHandlers)
             {
-                var ev = new TreeDataGridRowDragEventArgs(row, e);
+                var ev = new TreeDataGridRowDragEventArgs(RowDropEvent, row, e);
                 ev.Position = position;
                 RaiseEvent(ev);
 

diff --git a/src/Avalonia.Controls.TreeDataGrid/TreeDataGridRowDragEventArgs.cs b/src/Avalonia.Controls.TreeDataGrid/TreeDataGridRowDragEventArgs.cs
@@ -21,10 +21,11 @@ public class TreeDataGridRowDragEventArgs : RoutedEventArgs
         /// <summary>
         /// Initializes a new instance of the <see cref="TreeDataGridRowDragEventArgs"/> class.
         /// </summary>
+        /// <param name="routedEvent">The event being raised.</param>
         /// <param name="row">The row that is being dragged over.</param>
         /// <param name="inner">The inner drag event args.</param>
-        public TreeDataGridRowDragEventArgs(TreeDataGridRow row, DragEventArgs inner)
-            : base(TreeDataGrid.RowDragOverEvent)
+        public TreeDataGridRowDragEventArgs(RoutedEvent routedEvent, TreeDataGridRow row, DragEventArgs inner)
+            : base(routedEvent)
         {
             TargetRow = row;
             Inner = inner;