From 363b2a0489ed682cbf6f31426f9f58f1308d551e Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Fri, 12 Jun 2020 11:05:16 +0200 Subject: [PATCH] Fix failing tests. `ScrollContentPresenter` now coerces offset so it can only be set after a viewport has been calculated. --- .../Presenters/ScrollContentPresenterTests.cs | 8 ++++++-- .../ScrollContentPresenterTests_ILogicalScrollable.cs | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests.cs index 57f0230f48..f6130d49d6 100644 --- a/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests.cs +++ b/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests.cs @@ -117,13 +117,17 @@ namespace Avalonia.Controls.UnitTests.Presenters Width = 150, Height = 150, }, - Offset = new Vector(25, 25), }; target.UpdateChild(); target.Measure(new Size(100, 100)); target.Arrange(new Rect(0, 0, 100, 100)); + target.Offset = new Vector(25, 25); + + target.Measure(new Size(100, 100)); + target.Arrange(new Rect(0, 0, 100, 100)); + Assert.Equal(new Rect(-25, -25, 150, 150), content.Bounds); } @@ -345,4 +349,4 @@ namespace Avalonia.Controls.UnitTests.Presenters } } } -} \ No newline at end of file +} diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests_ILogicalScrollable.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests_ILogicalScrollable.cs index 53591eda5b..a3292644b3 100644 --- a/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests_ILogicalScrollable.cs +++ b/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests_ILogicalScrollable.cs @@ -59,13 +59,17 @@ namespace Avalonia.Controls.UnitTests CanHorizontallyScroll = true, CanVerticallyScroll = true, Content = scrollable, - Offset = new Vector(25, 25), }; target.UpdateChild(); target.Measure(new Size(100, 100)); target.Arrange(new Rect(0, 0, 100, 100)); + target.Offset = new Vector(25, 25); + + target.Measure(new Size(100, 100)); + target.Arrange(new Rect(0, 0, 100, 100)); + Assert.Equal(new Rect(-25, -25, 150, 150), scrollable.Bounds); }