diff options
| author | Stephane Delcroix <stephane@delcroix.org> | 2016-04-17 23:59:44 +0200 |
|---|---|---|
| committer | Jason Smith <jason.smith@xamarin.com> | 2016-04-17 14:59:44 -0700 |
| commit | cdd6d4defc844b605890e7ad731e27e373b09bf4 (patch) | |
| tree | ddf897b6bf475273a247891898a6c7daf7fb2079 /Xamarin.Forms.Xaml/ApplyPropertiesVisitor.cs | |
| parent | 0b10ab0c130c814b4ab1595c8d13c4c6c9c9d5df (diff) | |
| download | xamarin-forms-cdd6d4defc844b605890e7ad731e27e373b09bf4.tar.gz xamarin-forms-cdd6d4defc844b605890e7ad731e27e373b09bf4.tar.bz2 xamarin-forms-cdd6d4defc844b605890e7ad731e27e373b09bf4.zip | |
Merged ResourceDictionary (#97)
* [X] Support Merged RD
* [X] Support RD as xaml roots
* [XamlC] I have no idea how that used to work before
* [C] Remove debugging statements
* fix docs
Diffstat (limited to 'Xamarin.Forms.Xaml/ApplyPropertiesVisitor.cs')
| -rw-r--r-- | Xamarin.Forms.Xaml/ApplyPropertiesVisitor.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Xamarin.Forms.Xaml/ApplyPropertiesVisitor.cs b/Xamarin.Forms.Xaml/ApplyPropertiesVisitor.cs index 8978f4fd..0a0651a7 100644 --- a/Xamarin.Forms.Xaml/ApplyPropertiesVisitor.cs +++ b/Xamarin.Forms.Xaml/ApplyPropertiesVisitor.cs @@ -133,7 +133,7 @@ namespace Xamarin.Forms.Xaml if (typeof (IEnumerable).GetTypeInfo().IsAssignableFrom(Context.Types[parentElement].GetTypeInfo())) { var source = Values[parentNode]; - if (Context.Types[parentElement] != typeof (ResourceDictionary)) + if (!(typeof (ResourceDictionary).IsAssignableFrom(Context.Types[parentElement]))) { var addMethod = Context.Types[parentElement].GetRuntimeMethods().First(mi => mi.Name == "Add" && mi.GetParameters().Length == 1); @@ -291,7 +291,7 @@ namespace Xamarin.Forms.Xaml return null; } - public static void SetPropertyValue(object xamlelement, XmlName propertyName, object value, BindableObject rootElement, + public static void SetPropertyValue(object xamlelement, XmlName propertyName, object value, object rootElement, INode node, HydratationContext context, IXmlLineInfo lineInfo) { var elementType = xamlelement.GetType(); |