|
|
@ -68,10 +68,14 @@ namespace ICSharpCode.WpfDesign.XamlDom |
|
|
|
} else if (collectionInstance is ResourceDictionary) { |
|
|
|
} else if (collectionInstance is ResourceDictionary) { |
|
|
|
object val = newElement.GetValueFor(null); |
|
|
|
object val = newElement.GetValueFor(null); |
|
|
|
object key = newElement is XamlObject ? ((XamlObject)newElement).GetXamlAttribute("Key") : null; |
|
|
|
object key = newElement is XamlObject ? ((XamlObject)newElement).GetXamlAttribute("Key") : null; |
|
|
|
if (key == null) { |
|
|
|
if (key == null || key == "") { |
|
|
|
if (val is Style) |
|
|
|
if (val is Style) |
|
|
|
key = ((Style)val).TargetType; |
|
|
|
key = ((Style)val).TargetType; |
|
|
|
|
|
|
|
else if (val is DataTemplate) |
|
|
|
|
|
|
|
key = ((DataTemplate)val).DataType; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
if (key == null || key == "") |
|
|
|
|
|
|
|
key = val; |
|
|
|
((ResourceDictionary)collectionInstance).Add(key, val); |
|
|
|
((ResourceDictionary)collectionInstance).Add(key, val); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
collectionType.InvokeMember( |
|
|
|
collectionType.InvokeMember( |
|
|
|