diff options
Diffstat (limited to 'Xamarin.Forms.Core/ResourceDictionary.cs')
-rw-r--r-- | Xamarin.Forms.Core/ResourceDictionary.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Xamarin.Forms.Core/ResourceDictionary.cs b/Xamarin.Forms.Core/ResourceDictionary.cs index bff6127b..791c6e5d 100644 --- a/Xamarin.Forms.Core/ResourceDictionary.cs +++ b/Xamarin.Forms.Core/ResourceDictionary.cs @@ -92,7 +92,14 @@ namespace Xamarin.Forms [IndexerName("Item")] public object this[string index] { - get { return _innerDictionary[index]; } + get + { + if (_innerDictionary.ContainsKey(index)) + return _innerDictionary[index]; + if (_mergedInstance != null && _mergedInstance.ContainsKey(index)) + return _mergedInstance[index]; + throw new KeyNotFoundException(); + } set { _innerDictionary[index] = value; |