Browse Source

Add Content attribute to ContentPresenter (#21997)

* Add Content attribute to ContentPresenter

* Add ContentPresenter default content property test
pull/22014/head
Yoyo 1 month ago
committed by GitHub
parent
commit
f61bcc32d4
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 1
      src/Avalonia.Controls/Presenters/ContentPresenter.cs
  2. 11
      tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs

1
src/Avalonia.Controls/Presenters/ContentPresenter.cs

@ -364,6 +364,7 @@ namespace Avalonia.Controls.Presenters
/// <summary>
/// Gets or sets the content to be displayed by the presenter.
/// </summary>
[Content]
[DependsOn(nameof(ContentTemplate))]
public object? Content
{

11
tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs

@ -42,6 +42,17 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
Assert.Equal("Foo", target.Content);
}
[Fact]
public void ContentPresenter_Default_Content_Property_Is_Set()
{
var xaml = @"<ContentPresenter xmlns='https://github.com/avaloniaui'>Foo</ContentPresenter>";
var target = AvaloniaRuntimeXamlLoader.Parse<ContentPresenter>(xaml);
Assert.NotNull(target);
Assert.Equal("Foo", target.Content);
}
[Fact]
public void Attached_Property_Is_Set()
{

Loading…
Cancel
Save