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

carldebilly · carldebilly · commit 8d6075d49779 · 2022-03-28T16:26:10.000-04:00
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 number	Diff line change
`@@ -296,12 +296,13 @@ public void Arrange(Rect finalRect)`
`296`	`296`	`{`
`297`	`297`	`LayoutInformation.SetLayoutSlot(this, finalRect);`
`298`	`298`	`HideVisual();`
`299`		`- ClearLayoutFlags(LayoutFlag.ArrangeDirty);`
	`299`	`+ ClearLayoutFlags(LayoutFlag.ArrangeDirty \| LayoutFlag.ArrangeDirtyPath);`
`300`	`300`	`return;`
`301`	`301`	`}`
`302`	`302`
`303`	`303`	`if (!IsArrangeDirtyOrArrangeDirtyPath && finalRect == LayoutSlot)`
`304`	`304`	`{`
	`305`	`+ ClearLayoutFlags(LayoutFlag.ArrangeDirty \| LayoutFlag.ArrangeDirtyPath);`
`305`	`306`	`return; // Calling Arrange would be a waste of CPU time here.`
`306`	`307`	`}`
`307`	`308`
Original file line number	Diff line number	Diff line change
`@@ -552,7 +552,7 @@ private static void InnerUpdateLayout(UIElement root)`
`552`	`552`	`}`
`553`	`553`	`}`
`554`	`554`	`#else`
`555`		`- for (var i = 0; i < MaxLayoutIterations; i++)`
	`555`	`+ for (var i = MaxLayoutIterations; i > 0; i--)`
`556`	`556`	`{`
`557`	`557`	`if (root.IsMeasureDirtyOrMeasureDirtyPath)`
`558`	`558`	`{`