From fc05a57e9dfa5b70e21b08f9c8f839b7986b4698 Mon Sep 17 00:00:00 2001 From: Jason Smith Date: Mon, 18 Apr 2016 09:44:21 -0700 Subject: Make sure StaticResources can be looked up in ResourceDictionaries directly (#106) --- Xamarin.Forms.Xaml/MarkupExtensions/StaticResourceExtension.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 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 4f1465d3..cf672a3d 100644 --- a/Xamarin.Forms.Xaml/MarkupExtensions/StaticResourceExtension.cs +++ b/Xamarin.Forms.Xaml/MarkupExtensions/StaticResourceExtension.cs @@ -27,12 +27,11 @@ namespace Xamarin.Forms.Xaml foreach (var p in valueProvider.ParentObjects) { var ve = p as VisualElement; - if (ve == null) - continue; - if (ve.Resources == null) + var resDict = ve?.Resources ?? p as ResourceDictionary; + if (resDict == null) continue; object res; - if (ve.Resources.TryGetValue(Key, out res)) + if (resDict.TryGetValue(Key, out res)) { return ConvertCompiledOnPlatform(res); } -- cgit v1.2.3