fixed #437

HandyOrg · Jul 14, 2020 · 25a6117 · 25a6117
1 parent 7969435
commit 25a6117
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/RelativePanel.cs b/src/Shared/HandyControl_Shared/Controls/Panel/RelativePanel.cs
@@ -217,7 +217,7 @@ protected override Size MeasureOverride(Size availableSize)
 
             #region Calc AvailableSize
 
-            _childGraph.Reset();
+            _childGraph.Reset(false);
             var boundingSize = _childGraph.GetBoundingSize(Width.IsNaN(), Height.IsNaN());
             _childGraph.Reset();
             _childGraph.Measure(boundingSize);
@@ -284,17 +284,21 @@ public GraphNode(UIElement element)
 
             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;
 
                 if (!OutgoingNodes.Any())
@@ -373,7 +377,7 @@ public void Clear()
                 _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, UIElement to)
             {