Browse Source

Fix Unit Tests

pull/448/head
jkuehner 12 years ago
parent
commit
2a76625355
  1. 9
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/SnaplinePlacementBehavior.cs

9
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/SnaplinePlacementBehavior.cs

@ -180,23 +180,27 @@ namespace ICSharpCode.WpfDesign.Designer.Extensions
private IEnumerable<DesignItem> AllDesignItems(DesignItem designItem = null) private IEnumerable<DesignItem> AllDesignItems(DesignItem designItem = null)
{ {
if (designItem == null) if (designItem == null && this.ExtendedItem.Services.DesignPanel is DesignPanel)
{ {
designItem = this.ExtendedItem.Services.DesignPanel.Context.RootItem; designItem = this.ExtendedItem.Services.DesignPanel.Context.RootItem;
if (designItem != null) {
yield return designItem; yield return designItem;
if (designItem.ContentProperty.Value != null) { if (designItem.ContentProperty.Value != null) {
yield return designItem.ContentProperty.Value; yield return designItem.ContentProperty.Value;
designItem = designItem.ContentProperty.Value; designItem = designItem.ContentProperty.Value;
} }
} }
}
if (designItem.ContentProperty != null && designItem.ContentProperty.IsCollection) if (designItem != null && designItem.ContentProperty != null && designItem.ContentProperty.IsCollection)
foreach (var collectionElement in designItem.ContentProperty.CollectionElements) foreach (var collectionElement in designItem.ContentProperty.CollectionElements)
{ {
if (collectionElement != null)
yield return collectionElement; yield return collectionElement;
foreach (var el in AllDesignItems(collectionElement)) foreach (var el in AllDesignItems(collectionElement))
{ {
if (el != null)
yield return el; yield return el;
} }
} }
@ -365,3 +369,4 @@ namespace ICSharpCode.WpfDesign.Designer.Extensions
} }
} }
} }
Loading…
Cancel
Save