X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2FTizen.NUI%2Fsrc%2Finternal%2FXaml%2FMarkupExtensions%2FStaticResourceExtension.cs;h=9218b4ccecaec89925abd56ce1eca210a76257df;hb=23b8604831b16c6a7fcbe091e791edba456b5fcc;hp=f0ddb68f5a55e80733aeb57e82403b83a4611e56;hpb=0b21798d12f8aca68c422b7fbcd13c93d1793418;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git diff --git a/src/Tizen.NUI/src/internal/Xaml/MarkupExtensions/StaticResourceExtension.cs b/src/Tizen.NUI/src/internal/Xaml/MarkupExtensions/StaticResourceExtension.cs index f0ddb68..9218b4c 100755 --- a/src/Tizen.NUI/src/internal/Xaml/MarkupExtensions/StaticResourceExtension.cs +++ b/src/Tizen.NUI/src/internal/Xaml/MarkupExtensions/StaticResourceExtension.cs @@ -30,7 +30,7 @@ namespace Tizen.NUI.Xaml foreach (var p in valueProvider.ParentObjects) { var irp = p as IResourcesProvider; - var resDict = irp != null && irp.IsResourcesCreated ? irp.Resources : p as ResourceDictionary; + var resDict = irp != null && irp.IsResourcesCreated ? irp.XamlResources : p as ResourceDictionary; if (resDict == null) continue; if (resDict.TryGetValue(Key, out resource)) @@ -83,7 +83,7 @@ namespace Tizen.NUI.Xaml internal object GetApplicationLevelResource(string key, IXmlLineInfo xmlLineInfo) { object resource = null; - if (Application.Current == null || !((IResourcesProvider)Application.Current).IsResourcesCreated || !Application.Current.Resources.TryGetValue(Key, out resource)) + if (Application.Current == null || !((IResourcesProvider)Application.Current).IsResourcesCreated || !Application.Current.XamlResources.TryGetValue(Key, out resource)) throw new XamlParseException($"StaticResource not found for key {Key}", xmlLineInfo); return resource; }