Skip to content

Use target root element to display adorners #199

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

Merged
merged 1 commit into from
Aug 12, 2016
Merged

Use target root element to display adorners #199

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
8 changes: 4 additions & 4 deletions GongSolutions.Wpf.DragDrop/DragDrop.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ private static void IsDropTargetChanged(DependencyObject d, DependencyPropertyCh
}
}

private static void CreateDragAdorner()
private static void CreateDragAdorner(DropInfo dropInfo)
{
var template = GetDragAdornerTemplate(m_DragInfo.VisualSource);
var templateSelector = GetDragAdornerTemplateSelector(m_DragInfo.VisualSource);
Expand Down Expand Up @@ -499,7 +499,7 @@ private static void CreateDragAdorner()
adornment.Opacity = GetDefaultDragAdornerOpacity(m_DragInfo.VisualSource);
}

var rootElement = RootElementFinder.FindRoot(m_DragInfo.VisualSource);
var rootElement = RootElementFinder.FindRoot(dropInfo.VisualTarget ?? m_DragInfo.VisualSource);
DragAdorner = new DragAdorner(rootElement, adornment);
}
}
Expand Down Expand Up @@ -542,7 +542,7 @@ private static void CreateEffectAdorner(DropInfo dropInfo)
var template = GetEffectAdornerTemplate(m_DragInfo.VisualSource, dropInfo.Effects, dropInfo.DestinationText);

if (template != null) {
var rootElement = RootElementFinder.FindRoot(m_DragInfo.VisualSource);
var rootElement = RootElementFinder.FindRoot(dropInfo.VisualTarget ?? m_DragInfo.VisualSource);

var adornment = new ContentPresenter();
adornment.Content = m_DragInfo.Data;
Expand Down Expand Up @@ -869,7 +869,7 @@ private static void DropTarget_PreviewDragOver(object sender, DragEventArgs e)
dropHandler.DragOver(dropInfo);

if (DragAdorner == null && m_DragInfo != null) {
CreateDragAdorner();
CreateDragAdorner(dropInfo);
}

if (DragAdorner != null) {
Expand Down