Browse Source

Merge branch 'master' into fixes/5879-icustomhittest

pull/5923/head
Max Katz 5 years ago
committed by GitHub
parent
commit
81e703430c
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 9
      src/Avalonia.Layout/WrapLayout/WrapLayout.cs

9
src/Avalonia.Layout/WrapLayout/WrapLayout.cs

@ -236,6 +236,15 @@ namespace Avalonia.Layout
// for the last condition it is zeros so adding it will make no difference // 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 // this way is faster than an if condition in every loop for checking the last item
totalMeasure.U = parentMeasure.U; 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.V = state.GetHeight();
totalMeasure.U = Math.Ceiling(totalMeasure.U); totalMeasure.U = Math.Ceiling(totalMeasure.U);

Loading…
Cancel
Save