Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Always correctly reset state when drag is cancelled #497

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Always correctly reset state when drag is cancelled #497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/GongSolutions.WPF.DragDrop/DragDrop.Properties.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ private static void OnIsDragSourceChanged(DependencyObject d, DependencyProperty
uiElement.PreviewTouchUp -= DragSourceOnTouchUp;
uiElement.PreviewTouchMove -= DragSourceOnTouchMove;

uiElement.QueryContinueDrag -= DragSourceOnQueryContinueDrag;
uiElement.GiveFeedback -= DragSourceOnGiveFeedback;

if ((bool)e.NewValue)
Expand All @@ -113,7 +112,6 @@ private static void OnIsDragSourceChanged(DependencyObject d, DependencyProperty
uiElement.PreviewTouchUp += DragSourceOnTouchUp;
uiElement.PreviewTouchMove += DragSourceOnTouchMove;

uiElement.QueryContinueDrag += DragSourceOnQueryContinueDrag;
uiElement.GiveFeedback += DragSourceOnGiveFeedback;
}
}
Expand Down
15 changes: 4 additions & 11 deletions src/GongSolutions.WPF.DragDrop/DragDrop.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,6 +655,10 @@ private static void DoDragSourceMove(object sender, Func<IInputElement, Point> g
if (dragDropEffects == DragDropEffects.None)
{
dragHandler.DragCancelled();
DragDropPreview = null;
DragDropEffectPreview = null;
DropTargetAdorner = null;
Mouse.OverrideCursor = null;
}

dragHandler.DragDropOperationFinished(dragDropEffects, dragInfo);
Expand All @@ -678,17 +682,6 @@ private static void DoDragSourceMove(object sender, Func<IInputElement, Point> g
}
}

private static void DragSourceOnQueryContinueDrag(object sender, QueryContinueDragEventArgs e)
{
if (e.Action == DragAction.Cancel || e.EscapePressed || (e.KeyStates.HasFlag(DragDropKeyStates.LeftMouseButton) == e.KeyStates.HasFlag(DragDropKeyStates.RightMouseButton)))
{
DragDropPreview = null;
DragDropEffectPreview = null;
DropTargetAdorner = null;
Mouse.OverrideCursor = null;
}
}

private static void DropTargetOnDragLeave(object sender, DragEventArgs e)
{
SetIsDragOver(sender as DependencyObject, false);
Expand Down
Loading