Merge pull request AvaloniaUI#8305 from AvaloniaUI/fixes/reduce-exces…

…sive-layout-passes Fixes/reduce excessive layout passes # Conflicts: # tests/Avalonia.Layout.UnitTests/LayoutManagerTests.cs
donandren · Jun 10, 2022 · 82d55a1 · 82d55a1
1 parent 96c21bf
commit 82d55a1
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 10 deletions.
diff --git a/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm b/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
@@ -297,14 +297,15 @@
         }
 
         @try {
-            lastSize = NSSize {x, y};
-
-            if (!_shown) {
-                BaseEvents->Resized(AvnSize{x, y}, reason);
-            }
-            else if(Window != nullptr) {
-                [Window setContentSize:lastSize];
-                [Window invalidateShadow];
+            if(x != lastSize.width || y != lastSize.height) {
+                lastSize = NSSize{x, y};
+
+                if (!_shown) {
+                    BaseEvents->Resized(AvnSize{x, y}, reason);
+                } else if (Window != nullptr) {
+                    [Window setContentSize:lastSize];
+                    [Window invalidateShadow];
+                }
             }
         }
         @finally {

diff --git a/src/Avalonia.Layout/LayoutManager.cs b/src/Avalonia.Layout/LayoutManager.cs
@@ -28,7 +28,7 @@ public class LayoutManager : ILayoutManager, IDisposable
         public LayoutManager(ILayoutRoot owner)
         {
             _owner = owner ?? throw new ArgumentNullException(nameof(owner));
-            _executeLayoutPass = ExecuteLayoutPass;
+            _executeLayoutPass = ExecuteQueuedLayoutPass;
         }
 
         public virtual event EventHandler? LayoutUpdated;
@@ -94,6 +94,16 @@ public virtual void InvalidateArrange(ILayoutable control)
             QueueLayoutPass();
         }
 
+        private void ExecuteQueuedLayoutPass()
+        {
+            if (!_queued)
+            {
+                return;
+            }
+
+            ExecuteLayoutPass();
+        }
+
         /// <inheritdoc/>
         public virtual void ExecuteLayoutPass()
         {
@@ -319,8 +329,8 @@ private void QueueLayoutPass()
         {
             if (!_queued && !_running)
             {
-                Dispatcher.UIThread.Post(_executeLayoutPass, DispatcherPriority.Layout);
                 _queued = true;
+                Dispatcher.UIThread.Post(_executeLayoutPass, DispatcherPriority.Layout);
             }
         }
 

diff --git a/tests/Avalonia.Layout.UnitTests/LayoutManagerTests.cs b/tests/Avalonia.Layout.UnitTests/LayoutManagerTests.cs
@@ -1,6 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using Avalonia.Controls;
+using Avalonia.Layout;
+using Avalonia.Threading;
 using Xunit;
 
 namespace Avalonia.Layout.UnitTests
@@ -420,5 +422,22 @@ public void Calling_ExecuteLayoutPass_From_ExecuteInitialLayoutPass_Does_Not_Bre
             Assert.Equal(new Size(200, 200), control.Bounds.Size);
             Assert.Equal(new Size(200, 200), control.DesiredSize);
         }
+
+        [Fact]
+        public void LayoutManager_Execute_Layout_Pass_Should_Clear_Queued_LayoutPasses()
+        {
+            var control = new LayoutTestControl();
+            var root = new LayoutTestRoot { Child = control };
+
+            int layoutCount = 0;
+            root.LayoutUpdated += (_, _) => layoutCount++;
+
+            root.LayoutManager.InvalidateArrange(control);
+            root.LayoutManager.ExecuteInitialLayoutPass();
+
+            Dispatcher.UIThread.RunJobs(DispatcherPriority.Layout);
+
+            Assert.Equal(1, layoutCount);
+        }
     }
 }