Browse Source

Setup TreeDataTemplate Content property.

pull/237/head
Steven Kirk 11 years ago
parent
commit
c8ee522c49
  1. 3
      src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs
  2. 1
      src/Markup/Perspex.Markup.Xaml/Templates/DataTemplate.cs
  3. 1
      src/Markup/Perspex.Markup.Xaml/Templates/TreeDataTemplate.cs

3
src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs

@ -116,6 +116,7 @@ namespace Perspex.Markup.Xaml.Context
var contentProperties = new Collection<ContentPropertyDefinition> var contentProperties = new Collection<ContentPropertyDefinition>
{ {
new ContentPropertyDefinition(typeof(ContentControl), "Content"), new ContentPropertyDefinition(typeof(ContentControl), "Content"),
new ContentPropertyDefinition(typeof(DataTemplate), "Content"),
new ContentPropertyDefinition(typeof(Decorator), "Child"), new ContentPropertyDefinition(typeof(Decorator), "Child"),
new ContentPropertyDefinition(typeof(ItemsControl), "Items"), new ContentPropertyDefinition(typeof(ItemsControl), "Items"),
new ContentPropertyDefinition(typeof(GradientBrush), "GradientStops"), new ContentPropertyDefinition(typeof(GradientBrush), "GradientStops"),
@ -123,7 +124,7 @@ namespace Perspex.Markup.Xaml.Context
new ContentPropertyDefinition(typeof(Style), "Setters"), new ContentPropertyDefinition(typeof(Style), "Setters"),
new ContentPropertyDefinition(typeof(TextBlock), "Text"), new ContentPropertyDefinition(typeof(TextBlock), "Text"),
new ContentPropertyDefinition(typeof(TextBox), "Text"), new ContentPropertyDefinition(typeof(TextBox), "Text"),
new ContentPropertyDefinition(typeof(DataTemplate), "Content"), new ContentPropertyDefinition(typeof(TreeDataTemplate), "Content"),
}; };
contentPropertyProvider.AddAll(contentProperties); contentPropertyProvider.AddAll(contentProperties);

1
src/Markup/Perspex.Markup.Xaml/Templates/DataTemplate.cs

@ -8,7 +8,6 @@ using Perspex.Controls.Templates;
namespace Perspex.Markup.Xaml.Templates namespace Perspex.Markup.Xaml.Templates
{ {
[ContentProperty("Content")]
public class DataTemplate : IDataTemplate public class DataTemplate : IDataTemplate
{ {
public Type DataType { get; set; } public Type DataType { get; set; }

1
src/Markup/Perspex.Markup.Xaml/Templates/TreeDataTemplate.cs

@ -10,7 +10,6 @@ using Perspex.Markup.Xaml.Binding;
namespace Perspex.Markup.Xaml.Templates namespace Perspex.Markup.Xaml.Templates
{ {
[ContentProperty("Content")]
public class TreeDataTemplate : ITreeDataTemplate public class TreeDataTemplate : ITreeDataTemplate
{ {
public Type DataType { get; set; } public Type DataType { get; set; }

Loading…
Cancel
Save