From 2d7c8645d0e82ed71edce10472bb5d5b1360d1d2 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Mon, 21 Nov 2022 01:14:43 +0600 Subject: [PATCH 1/2] Recalculate parent's child render nodes on visual tree attachment --- src/Avalonia.Base/Visual.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Avalonia.Base/Visual.cs b/src/Avalonia.Base/Visual.cs index 69389def56..51fc143f72 100644 --- a/src/Avalonia.Base/Visual.cs +++ b/src/Avalonia.Base/Visual.cs @@ -432,6 +432,7 @@ namespace Avalonia OnAttachedToVisualTree(e); AttachedToVisualTree?.Invoke(this, e); InvalidateVisual(); + _visualRoot.Renderer.RecalculateChildren(_visualParent!); if (ZIndex != 0 && this.GetVisualParent() is Visual parent) parent.HasNonUniformZIndexChildren = true; From 18781d62ce8ba4566f512bc904200b3c3b9502fc Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Thu, 1 Dec 2022 19:44:07 +0300 Subject: [PATCH 2/2] Null check --- src/Avalonia.Base/Visual.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Avalonia.Base/Visual.cs b/src/Avalonia.Base/Visual.cs index be1ba05c71..7694119589 100644 --- a/src/Avalonia.Base/Visual.cs +++ b/src/Avalonia.Base/Visual.cs @@ -417,7 +417,7 @@ namespace Avalonia OnAttachedToVisualTree(e); AttachedToVisualTree?.Invoke(this, e); InvalidateVisual(); - _visualRoot.Renderer.RecalculateChildren(_visualParent!); + _visualRoot.Renderer?.RecalculateChildren(_visualParent!); if (ZIndex != 0 && VisualParent is Visual parent) parent.HasNonUniformZIndexChildren = true;