From d3cc1b5651918c9d306ec0002515371cae85262a Mon Sep 17 00:00:00 2001 From: Stephane Delcroix Date: Tue, 11 Apr 2017 20:09:06 +0200 Subject: [C] Lookup in RD also lookup in merged RDs (#861) --- Xamarin.Forms.Xaml/MarkupExtensions/StaticResourceExtension.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Xamarin.Forms.Xaml/MarkupExtensions/StaticResourceExtension.cs') diff --git a/Xamarin.Forms.Xaml/MarkupExtensions/StaticResourceExtension.cs b/Xamarin.Forms.Xaml/MarkupExtensions/StaticResourceExtension.cs index 16c80533..14e0b8be 100644 --- a/Xamarin.Forms.Xaml/MarkupExtensions/StaticResourceExtension.cs +++ b/Xamarin.Forms.Xaml/MarkupExtensions/StaticResourceExtension.cs @@ -31,7 +31,7 @@ namespace Xamarin.Forms.Xaml var resDict = ve?.Resources ?? p as ResourceDictionary; if (resDict == null) continue; - if (resDict.TryGetMergedValue(Key, out resource)) + if (resDict.TryGetValue(Key, out resource)) break; } resource = resource ?? GetApplicationLevelResource(Key, xmlLineInfo); @@ -59,7 +59,7 @@ namespace Xamarin.Forms.Xaml internal object GetApplicationLevelResource(string key, IXmlLineInfo xmlLineInfo) { object resource; - if (Application.Current == null || Application.Current.Resources == null || !Application.Current.Resources.TryGetMergedValue(Key, out resource)) + if (Application.Current == null || Application.Current.Resources == null || !Application.Current.Resources.TryGetValue(Key, out resource)) throw new XamlParseException($"StaticResource not found for key {Key}", xmlLineInfo); return resource; } -- cgit v1.2.3