fix(layout_update): Fixed a potiential "Layout cycle detected." excep…

…tion
unoplatform · Mar 28, 2022 · 8d6075d · 8d6075d
1 parent 16c0b87
commit 8d6075d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/Uno.UI/UI/Xaml/UIElement.Layout.netstd.cs b/src/Uno.UI/UI/Xaml/UIElement.Layout.netstd.cs
@@ -296,12 +296,13 @@ public void Arrange(Rect finalRect)
 			{
 				LayoutInformation.SetLayoutSlot(this, finalRect);
 				HideVisual();
-				ClearLayoutFlags(LayoutFlag.ArrangeDirty);
+				ClearLayoutFlags(LayoutFlag.ArrangeDirty | LayoutFlag.ArrangeDirtyPath);
 				return;
 			}
 
 			if (!IsArrangeDirtyOrArrangeDirtyPath && finalRect == LayoutSlot)
 			{
+				ClearLayoutFlags(LayoutFlag.ArrangeDirty | LayoutFlag.ArrangeDirtyPath);
 				return; // Calling Arrange would be a waste of CPU time here.
 			}
 

diff --git a/src/Uno.UI/UI/Xaml/UIElement.cs b/src/Uno.UI/UI/Xaml/UIElement.cs
@@ -552,7 +552,7 @@ private static void InnerUpdateLayout(UIElement root)
 					}
 				}
 #else
-			for (var i = 0; i < MaxLayoutIterations; i++)
+			for (var i = MaxLayoutIterations; i > 0; i--)
 			{
 				if (root.IsMeasureDirtyOrMeasureDirtyPath)
 				{
-Original file line number
+Diff line change
@@ Expand Up / @@ -552,7 +552,7 @@ private static void InnerUpdateLayout(UIElement root) @@
     					}
     				}
     #else
-    			for (var i = 0; i < MaxLayoutIterations; i++)
+    			for (var i = MaxLayoutIterations; i > 0; i--)
     			{
     				if (root.IsMeasureDirtyOrMeasureDirtyPath)
     				{
@@ Expand Down @@