chore: Adjust Android's layouting workaround

unoplatform · Oct 3, 2024 · 2e4a1c4 · 2e4a1c4
1 parent 152944b
commit 2e4a1c4
Showing 1 changed file with 17 additions and 1 deletion.
diff --git a/src/Uno.UI/UI/Xaml/UIElement.cs b/src/Uno.UI/UI/Xaml/UIElement.cs
@@ -1157,7 +1157,23 @@ public void InvalidateMeasure()
 			SetLayoutFlags(LayoutFlag.MeasureDirty);
 
 			// HACK: Android's implementation of measure/arrange is not accurate. See comments in LayouterElementExtensions.DoMeasure
-			(VisualTreeHelper.GetParent(this) as UIElement)?.InvalidateMeasure();
+			global::Android.Views.IViewParent parent = this;
+			parent = parent.Parent;
+			while (parent is not null)
+			{
+				if (parent is UIElement parentAsUIElement)
+				{
+					parentAsUIElement.InvalidateMeasure();
+					break;
+				}
+				else
+				{
+					parent.RequestLayout();
+				}
+
+				parent = parent.Parent;
+			}
+
 #elif __IOS__
 			SetNeedsLayout();
 			SetLayoutFlags(LayoutFlag.MeasureDirty);