Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Validate visual parent on attaching to the tree #17049

Merged
merged 2 commits into from
Sep 18, 2024
Merged

Validate visual parent on attaching to the tree #17049

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f2c623
Validate visual parent on attaching to the tree
maxkatz6 Sep 18, 2024
b06ab0a
Update Visual.cs
maxkatz6 Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/Avalonia.Base/Visual.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,10 @@ protected virtual void OnAttachedToVisualTreeCore(VisualTreeAttachmentEventArgs
Logger.TryGet(LogEventLevel.Verbose, LogArea.Visual)?.Log(this, "Attached to visual tree");

_visualRoot = e.Root;
if (_visualParent is null)
{
throw new InvalidOperationException("Visual was attached to the root without being added to the visual parent first.");
}

if (RenderTransform is IMutableTransform mutableTransform)
{
Expand All @@ -505,14 +509,14 @@ protected virtual void OnAttachedToVisualTreeCore(VisualTreeAttachmentEventArgs
AttachToCompositor(compositingRenderer.Compositor);
}
InvalidateMirrorTransform();
UpdateIsEffectivelyVisible(_visualParent!.IsEffectivelyVisible);
UpdateIsEffectivelyVisible(_visualParent.IsEffectivelyVisible);
OnAttachedToVisualTree(e);
AttachedToVisualTree?.Invoke(this, e);
InvalidateVisual();

_visualRoot.Renderer.RecalculateChildren(_visualParent!);
_visualRoot.Renderer.RecalculateChildren(_visualParent);

if (ZIndex != 0 && _visualParent is { })
if (ZIndex != 0)
_visualParent.HasNonUniformZIndexChildren = true;

var visualChildren = VisualChildren;
Expand Down
Loading