From 3449784b09d529b950dd3ccd1560a08c5e9703de Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 15 Jul 2020 19:16:53 -0300
Subject: [PATCH] add fixes for relative panel

---
 src/Avalonia.Controls/RelativePanel.cs | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/Avalonia.Controls/RelativePanel.cs b/src/Avalonia.Controls/RelativePanel.cs
index a3ad30db76..38b5d9807c 100644
--- a/src/Avalonia.Controls/RelativePanel.cs
+++ b/src/Avalonia.Controls/RelativePanel.cs
@@ -54,7 +54,7 @@ namespace Avalonia.Controls
             }
             _childGraph.Measure(availableSize);
 
-            _childGraph.Reset();
+            _childGraph.Reset(false);
             var boundingSize = _childGraph.GetBoundingSize(Width.IsNaN(), Height.IsNaN());
             _childGraph.Reset();
             _childGraph.Measure(boundingSize);
@@ -119,17 +119,22 @@ namespace Avalonia.Controls
 
             public void Arrange(Size arrangeSize) => Element.Arrange(new Rect(Left, Top, Math.Max(arrangeSize.Width - Left - Right, 0), Math.Max(arrangeSize.Height - Top - Bottom, 0)));
 
-            public void Reset()
+            public void Reset(bool clearPos)
             {
-                Left = double.NaN;
-                Top = double.NaN;
-                Right = double.NaN;
-                Bottom = double.NaN;
+                if (clearPos)
+                {
+                    Left = double.NaN;
+                    Top = double.NaN;
+                    Right = double.NaN;
+                    Bottom = double.NaN;
+                }
+
                 Measured = false;
             }
 
             public Size GetBoundingSize()
             {
+                if (Left < 0 || Top < 0) return default;
                 if (Measured)
                     return BoundingSize;
 
@@ -209,7 +214,7 @@ namespace Avalonia.Controls
                 _nodeDic.Clear();
             }
 
-            public void Reset() => _nodeDic.Values.Do(node => node.Reset());
+            public void Reset(bool clearPos = true) => _nodeDic.Values.Do(node => node.Reset(clearPos));
 
             public GraphNode? AddLink(GraphNode from, Layoutable? to)
             {