Skip to content

Fix: Fixed issue with sidebar animations not being smooth for small sections #14206

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 2 commits into from
Dec 10, 2023
Merged

Fix: Fixed issue with sidebar animations not being smooth for small sections #14206

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6379bcd
Fix animation being choppy, especially for single item sections
marcelwgn Dec 9, 2023
b6b733f
Code cleanup
marcelwgn Dec 9, 2023
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
20 changes: 6 additions & 14 deletions src/Files.App/UserControls/SideBar/SideBarItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ private void SidebarItem_Loaded(object sender, RoutedEventArgs e)
{
childrenRepeater = repeater;
repeater.ElementPrepared += ChildrenPresenter_ElementPrepared;
repeater.SizeChanged += ChildrenPresenter_SizeChanged;
}
if (GetTemplateChild("FlyoutChildrenPresenter") is ItemsRepeater flyoutRepeater)
{
Expand All @@ -99,14 +98,6 @@ public void HandleItemChange()
Decorator = Item.ItemDecorator;
}

private void ChildrenPresenter_SizeChanged(object sender, SizeChangedEventArgs e)
{
if (e.NewSize.Height > 1)
{
ChildrenPresenterHeight = e.NewSize.Height;
}
}

private void HookupOwners()
{
FrameworkElement resolvingTarget = this;
Expand Down Expand Up @@ -337,12 +328,13 @@ private void UpdateExpansionState(bool useAnimations = true)
}
else
{
if (childrenRepeater != null)
if (Item?.Children is IList enumerable && enumerable.Count > 0 && childrenRepeater is not null)
{
if (childrenRepeater.ActualHeight > ChildrenPresenterHeight)
{
ChildrenPresenterHeight = childrenRepeater.ActualHeight;
}
var firstChild = childrenRepeater.GetOrCreateElement(0);

// Collapsed elements might have a desired size of 0 so we need to have a sensible fallback
var childHeight = firstChild.DesiredSize.Height > 0 ? firstChild.DesiredSize.Height : 32;
ChildrenPresenterHeight = enumerable.Count * childHeight;
}
VisualStateManager.GoToState(this, IsExpanded ? "Expanded" : "Collapsed", useAnimations);
VisualStateManager.GoToState(this, IsExpanded ? "ExpandedIconNormal" : "CollapsedIconNormal", useAnimations);
Expand Down