|
|
|
@ -54,6 +54,12 @@ namespace Avalonia.Markup.Xaml.PortableXaml |
|
|
|
base.Dispose(disposing); |
|
|
|
} |
|
|
|
|
|
|
|
public void ApplyAllDelayedProperties() |
|
|
|
{ |
|
|
|
//HACK: We need this because Begin/EndInit ordering is broken
|
|
|
|
_delayedValuesHelper.ApplyAll(); |
|
|
|
} |
|
|
|
|
|
|
|
protected internal override void OnAfterBeginInit(object value) |
|
|
|
{ |
|
|
|
//not called for avalonia objects
|
|
|
|
@ -137,7 +143,7 @@ namespace Avalonia.Markup.Xaml.PortableXaml |
|
|
|
|
|
|
|
if (_cnt == 0) |
|
|
|
{ |
|
|
|
EndInit(); |
|
|
|
ApplyAll(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -174,7 +180,7 @@ namespace Avalonia.Markup.Xaml.PortableXaml |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
private void EndInit() |
|
|
|
public void ApplyAll() |
|
|
|
{ |
|
|
|
//TODO: revisit this
|
|
|
|
//apply delayed values and clear
|
|
|
|
|