Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
2 changes: 1 addition & 1 deletion components/Extensions/src/Shadows/AttachedShadowBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,8 @@ protected internal virtual void OnElementContextInitialized(AttachedShadowElemen
/// <param name="context">The <see cref="AttachedShadowElementContext"/> that is being uninitialized.</param>
protected internal virtual void OnElementContextUninitialized(AttachedShadowElementContext context)
{
context.ClearAndDisposeResources();
ElementCompositionPreview.SetElementChildVisual(context.Element, null!);
context.ClearAndDisposeResources();
}

/// <inheritdoc/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,12 @@ private void Uninitialize()

IsInitialized = false;

if (Element != null)
{
ElementCompositionPreview.SetElementChildVisual(Element, null!);
Element.SizeChanged -= OnElementSizeChanged;
}

Parent.OnElementContextUninitialized(this);

if (SpriteVisual != null)
Expand All @@ -148,12 +154,6 @@ private void Uninitialize()
Shadow.Dispose();
}

if (Element != null)
{
ElementCompositionPreview.SetElementChildVisual(Element, null!);
Element.SizeChanged -= OnElementSizeChanged;
}

SpriteVisual = null;
Shadow = null;
ElementVisual = null;
Expand Down
Loading