Skip to content

Allow target adorners on non-ItemsControls #143

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 4 commits into from
Oct 8, 2015
Merged

Allow target adorners on non-ItemsControls #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b23f8ef
Update DropInfo.cs
emsaks Oct 8, 2015
e65d856
Update DragDrop.cs
emsaks Oct 8, 2015
b30305f
fixed bad paren.
emsaks Oct 8, 2015
87f0f08
wrong position of code block
emsaks Oct 8, 2015
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: 1 addition & 1 deletion GongSolutions.Wpf.DragDrop/DragDrop.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -891,7 +891,7 @@ private static void DropTarget_PreviewDragOver(object sender, DragEventArgs e)
var adornedElement =
itemsControl is TabControl
? itemsControl.GetVisualDescendent<TabPanel>()
: (itemsControl.GetVisualDescendent<ItemsPresenter>() ?? itemsControl.GetVisualDescendent<ScrollContentPresenter>() as UIElement);
: (itemsControl.GetVisualDescendent<ItemsPresenter>() ?? itemsControl.GetVisualDescendent<ScrollContentPresenter>() as UIElement ?? itemsControl);

if (adornedElement != null) {
if (dropInfo.DropTargetAdorner == null) {
Expand Down
6 changes: 4 additions & 2 deletions GongSolutions.Wpf.DragDrop/DropInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,14 +155,16 @@ public DropInfo(object sender, DragEventArgs e, DragInfo dragInfo)
this.InsertPosition |= RelativeInsertPosition.TargetItemCenter;
}
//System.Diagnostics.Debug.WriteLine("==> DropInfo: InsPos={0}, InsIndex={1}, X={2}, Item={3}", this.InsertPosition, this.InsertIndex, currentXPos, item);
}
}
}
else
{
this.TargetCollection = itemsControl.ItemsSource ?? itemsControl.Items;
this.InsertIndex = itemsControl.Items.Count;
//System.Diagnostics.Debug.WriteLine("==> DropInfo: {0}, item=NULL, {1}", this.InsertPosition, this.InsertIndex);
}
} else {
this.VisualTargetItem = this.VisualTarget;
}
}

Expand Down Expand Up @@ -344,4 +346,4 @@ public enum RelativeInsertPosition
AfterTargetItem = 1,
TargetItemCenter = 2
}
}
}