Skip to content

Commit eba1558

Browse files
bsundsbopunker76
authored andcommitted
Using DropInfo.VisualTarget for the target of drop hint adorner to support IDropInfoBuilder
1 parent f1d728e commit eba1558

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

src/GongSolutions.WPF.DragDrop/DragDrop.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,7 @@ private static void OnRealTargetDragLeave(object sender, DragEventArgs e)
735735
dropHandler.DragLeave(dropInfo);
736736
if(_dragInProgress)
737737
{
738-
DropHintHelpers.OnDragLeave(sender, dropHandler, dragInfo);
738+
DropHintHelpers.OnDragLeave(dropHandler, dragInfo, dropInfo);
739739
}
740740
}
741741

@@ -782,7 +782,7 @@ private static void DropTargetOnDragOver(object sender, DragEventArgs e, EventTy
782782
}
783783

784784
dropHandler.DragOver(dropInfo);
785-
DropHintHelpers.DragOver(sender, dropInfo);
785+
DropHintHelpers.DragOver(dropInfo);
786786

787787
if (dragInfo is not null)
788788
{

src/GongSolutions.WPF.DragDrop/DropHintHelpers.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ public static void OnDropFinished()
7676
/// </summary>
7777
/// <param name="dropHandler">The <see cref="IDropTarget"/> for the operation</param>
7878
/// <param name="dragInfo">The <see cref="IDragInfo"/> initiating the drag</param>
79-
/// <param name="sender">The target element of the drag</param>
80-
public static void OnDragLeave(object sender, IDropTarget dropHandler, IDragInfo dragInfo)
79+
/// <param name="dropInfo">Drop info containing with target.</param>
80+
public static void OnDragLeave(IDropTarget dropHandler, IDragInfo dragInfo, IDropInfo dropInfo)
8181
{
82-
var wrapper = _dropTargetHintReferences.Find(m => m.Target == sender);
82+
var wrapper = _dropTargetHintReferences.Find(m => m.Target == dropInfo.VisualTarget);
8383
if (wrapper != null)
8484
{
8585
var dropHintInfo = new DropHintInfo(dragInfo);
@@ -92,10 +92,9 @@ public static void OnDragLeave(object sender, IDropTarget dropHandler, IDragInfo
9292
/// Update drop hint for the current element.
9393
/// </summary>
9494
/// <param name="dropInfo"></param>
95-
/// <param name="sender"></param>
96-
public static void DragOver(object sender, IDropInfo dropInfo)
95+
public static void DragOver(IDropInfo dropInfo)
9796
{
98-
var wrapper = _dropTargetHintReferences.Find(m => m.Target == sender);
97+
var wrapper = _dropTargetHintReferences.Find(m => m.Target == dropInfo.VisualTarget);
9998
if (wrapper != null)
10099
{
101100
UpdateHintAdorner(wrapper, dropInfo.DropTargetHintAdorner, new DropHintData(dropInfo.DropTargetHintState, dropInfo.DropHintText));

0 commit comments

Comments
 (0)