Skip to content

Fix leak from autohide storyboard #144

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
josuave merged 1 commit into from
Jun 2, 2025
Merged

Fix leak from autohide storyboard #144

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
13 changes: 5 additions & 8 deletions src/ManagedShell.AppBar/AppBarWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ public FrameworkElement AutoHideElement
set
{
_autoHideElement = value;
_autoHideElement.RenderTransform = new TranslateTransform();
OnPropertyChanged();
}
}
Expand Down Expand Up @@ -225,24 +226,18 @@ private void AnimateAutoHide(bool isHiding, bool immediate = false)
animation.BeginTime = TimeSpan.FromMilliseconds(immediate ? 0 : isHiding ? AutoHideDelayMs : AutoHideShowDelayMs);
animation.EasingFunction = new SineEase();

Storyboard.SetTarget(animation, AutoHideElement);
Storyboard.SetTargetProperty(animation, new PropertyPath($"RenderTransform.(TranslateTransform.{(Orientation == Orientation.Horizontal ? 'Y' : 'X')})"));

var storyboard = new Storyboard();
storyboard.Children.Add(animation);

animation.CurrentStateInvalidated += (object sender, EventArgs e) => {
if (((AnimationClock)sender).CurrentState == ClockState.Active)
{
OnAutoHideAnimationBegin(isHiding);
}
};

storyboard.Completed += (object sender, EventArgs e) => {
animation.Completed += (object sender, EventArgs e) => {
OnAutoHideAnimationComplete(isHiding);
};

storyboard.Begin(AutoHideElement);
AutoHideElement.RenderTransform.BeginAnimation(Orientation == Orientation.Horizontal ? TranslateTransform.YProperty : TranslateTransform.XProperty, animation);
}

protected void PeekDuringAutoHide(int msToPeek = 1000)
Expand Down Expand Up @@ -368,6 +363,8 @@ private void OnClosing(object sender, CancelEventArgs e)
{
UnregisterAppBar();
_appBarManager.UnregisterAutoHideBar(this);
AutoHideElement?.RenderTransform?.BeginAnimation(TranslateTransform.YProperty, null);
AutoHideElement?.RenderTransform?.BeginAnimation(TranslateTransform.XProperty, null);

// unregister full-screen notifications
_fullScreenHelper.FullScreenApps.CollectionChanged -= FullScreenApps_CollectionChanged;
Expand Down