Merge pull request #493 from gumme/WpfDesignerSnaplineBugFix

siegfriedpammer · siegfriedpammer · commit d96bfb35a201 · 2014-06-11T16:27:09.000+02:00
Fix for bug introduced with new snapline behaviour
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/SnaplinePlacementBehavior.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/SnaplinePlacementBehavior.cs
@@ -189,7 +189,7 @@ private IEnumerable<DesignItem> AllDesignItems(DesignItem designItem = null)
 					yield return designItem;
 					if (designItem.ContentProperty.Value != null) {
 						yield return designItem.ContentProperty.Value;
-						designItem = designItem.ContentProperty.Value;
+						designItem = ExtendedItem; //set designitem back to current control after yield
 					}
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ private IEnumerable<DesignItem> AllDesignItems(DesignItem designItem = null)`
`189`	`189`	`yield return designItem;`
`190`	`190`	`if (designItem.ContentProperty.Value != null) {`
`191`	`191`	`yield return designItem.ContentProperty.Value;`
`192`		`- designItem = designItem.ContentProperty.Value;`
	`192`	`+ designItem = ExtendedItem; //set designitem back to current control after yield`
`193`	`193`	`}`
`194`	`194`	`}`
`195`	`195`	`}`