Skip to content

Fixed crashes for shadow animations on unloaded items #4265

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

Merged
merged 1 commit into from
Sep 22, 2021
Merged

Fixed crashes for shadow animations on unloaded items #4265

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 15 additions & 16 deletions Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Abstract/ShadowAnimation{TValue,TKeyFrame}.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,18 +54,22 @@ public AnimationBuilder AppendToBuilder(AnimationBuilder builder, UIElement pare
{
static AnimationBuilder ThrowArgumentNullException()
{
throw new ArgumentNullException(
"The target shadow cannot be animated at this time.");
throw new ArgumentNullException("The target shadow cannot be animated at this time.");
}

return ThrowArgumentNullException();
}

if (Target is IAttachedShadow allShadows)
{
// in this case we'll animate all the shadows being used.
// In this case we'll animate all the shadows being used
foreach (var context in allShadows.EnumerateElementContexts()) //// TODO: Find better way!!!
{
if (context.Shadow is not DropShadow shadow)
{
continue;
}

NormalizedKeyFrameAnimationBuilder<TKeyFrame>.Composition keyFrameBuilder = new(
explicitTarget,
Delay ?? delayHint ?? DefaultDelay,
Expand All @@ -75,25 +79,18 @@ static AnimationBuilder ThrowArgumentNullException()

AppendToBuilder(keyFrameBuilder, easingTypeHint, easingModeHint);

CompositionAnimation animation = keyFrameBuilder.GetAnimation(context.Shadow, out _);
CompositionAnimation animation = keyFrameBuilder.GetAnimation(shadow, out _);

builder.ExternalAnimation(context.Shadow, animation);
builder.ExternalAnimation(shadow, animation);
}

return builder;
}
else
else if (Effects.GetShadow((FrameworkElement)parent) is AttachedShadowBase shadowBase &&
shadowBase.GetElementContext((FrameworkElement)parent).Shadow is DropShadow shadow)
{
var shadowBase = Effects.GetShadow(parent as FrameworkElement);
if (shadowBase == null)
{
static AnimationBuilder ThrowArgumentNullException() => throw new ArgumentNullException("The target's shadow is null, make sure to set the Target property to an element with a Shadow");

return ThrowArgumentNullException();
}

var shadow = shadowBase.GetElementContext((FrameworkElement)parent).Shadow;

// In this case, the animation is targeting the single shadow attached to the target element.
// The same checks as before have been performed to ensure that unloading doesn't cause issues.
NormalizedKeyFrameAnimationBuilder<TKeyFrame>.Composition keyFrameBuilder = new(
explicitTarget,
Delay ?? delayHint ?? DefaultDelay,
Expand All @@ -107,6 +104,8 @@ static AnimationBuilder ThrowArgumentNullException()

return builder.ExternalAnimation(shadow, animation);
}

return builder;
}
}
}