test/HandyControl
1
0
Fork 0
mirror of https://gitee.com/handyorg/HandyControl.git synced 2024-12-02 11:57:37 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fixed #430 #431

Browse Source
This commit is contained in:
NaBian 2020-07-09 00:58:56 +08:00
parent 7184e3e20d
commit cb546c1896
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Shared/HandyControl_Shared/Controls/Panel/RelativePanel.cs
View File

@ -189,12 +189,19 @@ namespace HandyControl.Controls
protected override Size MeasureOverride(Size availableSize)
{
var maxSize = new Size();
foreach (UIElement child in InternalChildren)
{
child?.Measure(availableSize);
if (child != null)
{
child.Measure(availableSize);
maxSize.Width = Math.Max(maxSize.Width, child.DesiredSize.Width);
maxSize.Height = Math.Max(maxSize.Height, child.DesiredSize.Height);
}
}
return base.MeasureOverride(availableSize);
return maxSize;
}
protected override Size ArrangeOverride(Size arrangeSize)
@ -314,9 +321,9 @@ namespace HandyControl.Controls
_nodeDic.Clear();
}
public bool CheckCyclic() => CheckCyclic(_nodeDic.Values, null);
public bool CheckCyclic() => CheckCyclic(_nodeDic.Values, null, null);
private bool CheckCyclic(IEnumerable<GraphNode> nodes, HashSet<DependencyObject> set)
private bool CheckCyclic(IEnumerable<GraphNode> nodes, GraphNode waitNode, HashSet<DependencyObject> set)
{
if (set == null)
{
@ -346,9 +353,13 @@ namespace HandyControl.Controls
if (!set.Add(node.Element)) return true;
// 没有循环，且有依赖，则继续往下
return CheckCyclic(node.OutgoingNodes, set);
return CheckCyclic(node.OutgoingNodes, node.Arranged ? null : node, set);
}
if (waitNode != null)
{
ArrangeChild(waitNode);
}
return false;
}