Merge pull request #125 from gerritvanroekel/master

Fix an issue when the itempresenter contains more ContentControls
punker76 · Mar 26, 2015 · 9e85a9e · 9e85a9e
2 parents a850796 + ee1d97e
commit 9e85a9e
Showing 1 changed file with 2 additions and 1 deletion.
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);