fix(grid): prevent a NullRef Exception when .Arrange() is called befo…

…re .Measure()
unoplatform · May 5, 2021 · 1eea149 · 1eea149
1 parent ccff7f9
commit 1eea149
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/Uno.UI/UI/Xaml/Controls/Grid/Grid.cs b/src/Uno.UI/UI/Xaml/Controls/Grid/Grid.cs
@@ -1315,10 +1315,12 @@ protected override XSIZEF MeasureOverride(XSIZEF availableSize)
 		//------------------------------------------------------------------------
 		protected override XSIZEF ArrangeOverride(XSIZEF finalSize)
 		{
-			if (m_pRows == null || m_pColumns == null)
+			// UNO NRE FIX
+			if (HasGridFlags(GridFlags.DefinitionsChanged))
 			{
-				// Should call .Measure() first!
-				return default;
+				// A call to .Measure() is required before arranging children
+				// When the DefinitionsChanged is set, the measure is already invalidated
+				return default;  // Returning (0, 0)
 			}
 
 			// Locking the row and columns definitions to prevent changes by user code