Browse Source
Merge branch 'master' into issues/1930
pull/1931/head
Steven Kirk
8 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
1 additions and
7 deletions
-
src/Avalonia.Controls/Presenters/ContentPresenter.cs
|
|
@ -197,13 +197,6 @@ namespace Avalonia.Controls.Presenters |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/// <inheritdoc/>
|
|
|
|
|
|
protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e) |
|
|
|
|
|
{ |
|
|
|
|
|
base.OnAttachedToVisualTree(e); |
|
|
|
|
|
_dataTemplate = null; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
/// <summary>
|
|
|
/// Updates the <see cref="Child"/> control based on the control's <see cref="Content"/>.
|
|
|
/// Updates the <see cref="Child"/> control based on the control's <see cref="Content"/>.
|
|
|
/// </summary>
|
|
|
/// </summary>
|
|
|
@ -268,6 +261,7 @@ namespace Avalonia.Controls.Presenters |
|
|
protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e) |
|
|
protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e) |
|
|
{ |
|
|
{ |
|
|
base.OnAttachedToLogicalTree(e); |
|
|
base.OnAttachedToLogicalTree(e); |
|
|
|
|
|
_dataTemplate = null; |
|
|
_createdChild = false; |
|
|
_createdChild = false; |
|
|
InvalidateMeasure(); |
|
|
InvalidateMeasure(); |
|
|
} |
|
|
} |
|
|
|
