Browse Source

Its questionable if attached properties can be used in markup extensions. In either case, prefix should not be used for a normal property in markup extensions.

pull/53/merge
Tobias Gummesson 12 years ago committed by Siegfried Pammer
parent
commit
ef01c79f67
  1. 24
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlProperty.cs

24
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlProperty.cs

@ -363,19 +363,19 @@ namespace ICSharpCode.WpfDesign.XamlDom
internal string GetNameForMarkupExtension() internal string GetNameForMarkupExtension()
{ {
string name; if (IsAttached) {
if (IsAttached) string name = PropertyTargetType.Name + "." + PropertyName;
name = PropertyTargetType.Name + "." + PropertyName;
else var element = ParentObject.XmlElement;
name = PropertyName; string ns = ParentObject.OwnerDocument.GetNamespaceFor(PropertyTargetType);
var prefix = element.GetPrefixOfNamespace(ns);
var element = ParentObject.XmlElement; if (string.IsNullOrEmpty(prefix))
string ns = ParentObject.OwnerDocument.GetNamespaceFor(PropertyTargetType); return name;
var prefix = element.GetPrefixOfNamespace(ns); else
if (string.IsNullOrEmpty(prefix)) return prefix + ":" + name;
return name; }
else else
return prefix + ":" + name; return PropertyName;
} }
/// <summary> /// <summary>

Loading…
Cancel
Save