Port microsoft/microsoft-ui-xaml#4412 (#604)

Kinnara · Nov 10, 2023 · 26b748d · 26b748d
1 parent d3ad11a
commit 26b748d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/ModernWpf.Controls/Repeater/Layouts/FlowLayout/FlowLayoutAlgorithm.cs b/ModernWpf.Controls/Repeater/Layouts/FlowLayout/FlowLayoutAlgorithm.cs
@@ -471,9 +471,9 @@ private bool ShouldContinueFillingUpSpace(
 
                 // Ensure that both minor and major directions are taken into consideration so that if the scrolling direction
                 // is the same as the flow direction we still stop at the end of the viewport rectangle.
-                shouldContinue =
-                    (direction == GenerateDirection.Forward && elementMajorStart < rectMajorEnd && elementMinorStart < rectMinorEnd) ||
-                    (direction == GenerateDirection.Backward && elementMajorEnd > rectMajorStart && elementMinorEnd > rectMinorStart);
+                shouldContinue = direction == GenerateDirection.Forward
+                    ? elementMajorStart < rectMajorEnd && elementMinorStart < rectMinorEnd
+                    : elementMajorEnd > rectMajorStart && elementMinorEnd > rectMinorStart;
             }
 
             return shouldContinue;