Browse Source
Ensure templated parent control theme is applied.
pull/10273/head
José Pedro
4 years ago
No known key found for this signature in database
GPG Key ID: B8247B9301707B83
2 changed files with
7 additions and
1 deletions
-
src/Avalonia.Base/Layout/Layoutable.cs
-
src/Avalonia.Base/StyledElement.cs
|
|
@ -795,6 +795,12 @@ namespace Avalonia.Layout |
|
|
InvalidateMeasure(); |
|
|
InvalidateMeasure(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
internal override void OnTemplatedParentControlThemeChanged() |
|
|
|
|
|
{ |
|
|
|
|
|
base.OnTemplatedParentControlThemeChanged(); |
|
|
|
|
|
InvalidateMeasure(); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
/// <summary>
|
|
|
/// Called when the layout manager raises a LayoutUpdated event.
|
|
|
/// Called when the layout manager raises a LayoutUpdated event.
|
|
|
/// </summary>
|
|
|
/// </summary>
|
|
|
|
|
|
@ -390,7 +390,7 @@ namespace Avalonia |
|
|
/// </returns>
|
|
|
/// </returns>
|
|
|
public bool ApplyStyling() |
|
|
public bool ApplyStyling() |
|
|
{ |
|
|
{ |
|
|
if (_initCount == 0 && (!_stylesApplied || !_themeApplied)) |
|
|
if (_initCount == 0 && (!_stylesApplied || !_themeApplied || !_templatedParentThemeApplied)) |
|
|
{ |
|
|
{ |
|
|
GetValueStore().BeginStyling(); |
|
|
GetValueStore().BeginStyling(); |
|
|
|
|
|
|
|
|
|