From f380d306c5b7374febaa2fc720d97c82b92eb665 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Tue, 25 Aug 2020 13:11:54 +0100
Subject: [PATCH] ScrollContentPresenter, only block offset property updates
 during setting of offsetproperty inside arrange.

---
 .../Presenters/ScrollContentPresenter.cs      | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs b/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
index 327cfb7736..5fcb14c858 100644
--- a/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
@@ -257,15 +257,7 @@ namespace Avalonia.Controls.Presenters
                 return base.ArrangeOverride(finalSize);
             }
 
-            try
-            {
-                _arranging = true;
-                return ArrangeWithAnchoring(finalSize);
-            }
-            finally
-            {
-                _arranging = false;
-            }
+            return ArrangeWithAnchoring(finalSize);
         }
 
         private Size ArrangeWithAnchoring(Size finalSize)
@@ -316,7 +308,17 @@ namespace Avalonia.Controls.Presenters
                 }
 
                 Extent = newExtent;
-                Offset = newOffset;
+
+                try
+                {
+                    _arranging = true;
+                    Offset = newOffset;
+                }
+                finally
+                {
+                    _arranging = false;    
+                }
+                
                 ArrangeOverrideImpl(size, -Offset);
             }