Browse Source

Ensure templated parent control theme is applied.

pull/10273/head
José Pedro 4 years ago
parent
commit
b8a987e847
No known key found for this signature in database GPG Key ID: B8247B9301707B83
  1. 6
      src/Avalonia.Base/Layout/Layoutable.cs
  2. 2
      src/Avalonia.Base/StyledElement.cs

6
src/Avalonia.Base/Layout/Layoutable.cs

@ -795,6 +795,12 @@ namespace Avalonia.Layout
InvalidateMeasure();
}
internal override void OnTemplatedParentControlThemeChanged()
{
base.OnTemplatedParentControlThemeChanged();
InvalidateMeasure();
}
/// <summary>
/// Called when the layout manager raises a LayoutUpdated event.
/// </summary>

2
src/Avalonia.Base/StyledElement.cs

@ -390,7 +390,7 @@ namespace Avalonia
/// </returns>
public bool ApplyStyling()
{
if (_initCount == 0 && (!_stylesApplied || !_themeApplied))
if (_initCount == 0 && (!_stylesApplied || !_themeApplied || !_templatedParentThemeApplied))
{
GetValueStore().BeginStyling();

Loading…
Cancel
Save