diff --git a/src/Core/src/Handlers/Layout/LayoutExtensions.cs b/src/Core/src/Handlers/Layout/LayoutExtensions.cs index cc50cf76fb2e..b8825e0e9abe 100644 --- a/src/Core/src/Handlers/Layout/LayoutExtensions.cs +++ b/src/Core/src/Handlers/Layout/LayoutExtensions.cs @@ -20,13 +20,14 @@ public static int GetLayoutHandlerIndex(this ILayout layout, IView view) var found = false; var zIndex = view.ZIndex; var lowerViews = 0; - + for (int i = 0; i < count; i++) { var child = layout[i]; var childZIndex = child.ZIndex; - if (child == view) { + if (child == view) + { found = true; } diff --git a/src/Core/tests/Benchmarks/Benchmarks/LayoutBenchmarker.cs b/src/Core/tests/Benchmarks/Benchmarks/LayoutBenchmarker.cs index ac9c4923d9ee..c1c8b73b0022 100644 --- a/src/Core/tests/Benchmarks/Benchmarks/LayoutBenchmarker.cs +++ b/src/Core/tests/Benchmarks/Benchmarks/LayoutBenchmarker.cs @@ -12,14 +12,14 @@ public class LayoutBenchmarker new Border(), new Border(), new Border(), new Border(), new Border(), new Border(), new Border(), new Border(), new Border(), new Border(), new Border(), new Border(), new Border(), new Border() }; - + static readonly int Iterations = Views.Length; [Benchmark] public void GetLayoutHandlerIndex() { var layout = new VerticalStackLayout(); - + for (int i = 0; i < Iterations; i++) { var view = Views[i]; diff --git a/src/Core/tests/UnitTests/Layouts/ZIndexTests.cs b/src/Core/tests/UnitTests/Layouts/ZIndexTests.cs index 74b2a7a2c12b..d74ba92e40f9 100644 --- a/src/Core/tests/UnitTests/Layouts/ZIndexTests.cs +++ b/src/Core/tests/UnitTests/Layouts/ZIndexTests.cs @@ -200,7 +200,7 @@ public void LayoutHandlerIndexFollowsAddOrderWhenZIndexesAreEqual() Assert.Equal(2, layout.GetLayoutHandlerIndex(view2)); Assert.Equal(3, layout.GetLayoutHandlerIndex(view3)); } - + [Fact] public void LayoutHandlerIndexIsNegativeWhenChildIsNotFound() { @@ -208,11 +208,11 @@ public void LayoutHandlerIndexIsNegativeWhenChildIsNotFound() var view0 = CreateTestView(zIndex: 0); Assert.Equal(-1, layout.GetLayoutHandlerIndex(view0)); - + layout.Add(CreateTestView(zIndex: 0)); Assert.Equal(-1, layout.GetLayoutHandlerIndex(view0)); - - + + layout.Add(CreateTestView(zIndex: 0)); Assert.Equal(-1, layout.GetLayoutHandlerIndex(view0)); }