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

Jump to bottom

fixes from upstream, wraplayout. #5913

Merged
merged 2 commits into from
May 17, 2021
Merged

fixes from upstream, wraplayout. #5913

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5d608e
fixes from upstream, wraplayout.
May 12, 2021
656a3ac
Merge branch 'master' into upstream-wrap-layout-fixes
MarchingCube May 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/Avalonia.Layout/WrapLayout/WrapLayout.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,15 @@ protected internal override Size MeasureOverride(VirtualizingLayoutContext conte
// for the last condition it is zeros so adding it will make no difference
// this way is faster than an if condition in every loop for checking the last item
totalMeasure.U = parentMeasure.U;

// Propagating an infinite size causes a crash. This can happen if the parent is scrollable and infinite in the opposite
// axis to the panel. Clearing to zero prevents the crash.
// This is likely an incorrect use of the control by the developer, however we need stability here so setting a default that wont crash.
if (double.IsInfinity(totalMeasure.U))
{
totalMeasure.U = 0.0;
}

totalMeasure.V = state.GetHeight();

totalMeasure.U = Math.Ceiling(totalMeasure.U);
Expand Down