Merge pull request #125 from gerritvanroekel/master

punker76 · punker76 · commit 9e85a9e0381e · 2015-03-26T22:32:19.000+01:00
Fix an issue when the itempresenter contains more ContentControls
diff --git a/GongSolutions.Wpf.DragDrop/Utilities/VisualTreeExtensions.cs b/GongSolutions.Wpf.DragDrop/Utilities/VisualTreeExtensions.cs
@@ -94,7 +94,8 @@ public static DependencyObject GetVisualAncestor(this DependencyObject d, Type t
         if (item == itemsControl) {
           return lastFoundItemByType;
         }
-        if (item.GetType() == type || item.GetType().IsSubclassOf(type)) {
+        if ((item.GetType() == type || item.GetType().IsSubclassOf(type))
+            && (itemsControl == null || itemsControl.ItemContainerGenerator.IndexFromContainer(item) >= 0)) {
           lastFoundItemByType = item;
         }
         item = VisualTreeHelper.GetParent(item);

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,8 @@ public static DependencyObject GetVisualAncestor(this DependencyObject d, Type t`
`94`	`94`	`if (item == itemsControl) {`
`95`	`95`	`return lastFoundItemByType;`
`96`	`96`	`}`
`97`		`- if (item.GetType() == type \|\| item.GetType().IsSubclassOf(type)) {`
	`97`	`+ if ((item.GetType() == type \|\| item.GetType().IsSubclassOf(type))`
	`98`	`+ && (itemsControl == null \|\| itemsControl.ItemContainerGenerator.IndexFromContainer(item) >= 0)) {`
`98`	`99`	`lastFoundItemByType = item;`
`99`	`100`	`}`
`100`	`101`	`item = VisualTreeHelper.GetParent(item);`