Browse Source

Fixes Unit Test Animation4

pull/584/head
jkuehner 11 years ago
parent
commit
aa3f166bba
  1. 14
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SamplesTests.cs
  2. 3
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlProperty.cs

14
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SamplesTests.cs

@ -164,6 +164,20 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom @@ -164,6 +164,20 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
</FrameworkElement.Resources>
</UserControl>");
}
[Test]
public void Resources4()
{
TestLoading(@"<UserControl
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
<UserControl.Resources>
<ResourceDictionary>
<SolidColorBrush x:Key=""MyBrush"" Color=""Gold""/>
</ResourceDictionary>
</UserControl.Resources>
</UserControl>");
}
[Test]
public void Animation1()

3
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlProperty.cs

@ -352,7 +352,8 @@ namespace ICSharpCode.WpfDesign.XamlDom @@ -352,7 +352,8 @@ namespace ICSharpCode.WpfDesign.XamlDom
bool IsNodeCollectionForThisProperty(XmlNode node)
{
return _propertyElement == null && this.PropertyName != this.ParentObject.ContentPropertyName && this.ReturnType.IsAssignableFrom(this.ParentObject.OwnerDocument.TypeFinder.GetType(node.NamespaceURI, node.LocalName));
//Remove the commented check! This is Possible: BeginStoryboard=>The COntent Property is Storyboard, and the Content Element is also Storyboard!
return _propertyElement == null /* && this.PropertyName != this.ParentObject.ContentPropertyName */ && this.ReturnType.IsAssignableFrom(this.ParentObject.OwnerDocument.TypeFinder.GetType(node.NamespaceURI, node.LocalName));
}
internal void AddChildNodeToProperty(XmlNode newChildNode)

Loading…
Cancel
Save