tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

upstream relativepanel fixes from 

f4d4bdde10
pull/5783/head
Dan Walmsley 5 years ago
parent
ef39b94878
commit
57ec11d9d3
1 changed files with 24 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 46
      src/Avalonia.Controls/RelativePanel.cs

46
src/Avalonia.Controls/RelativePanel.cs
View File

@ -55,7 +55,7 @@ namespace Avalonia.Controls
_childGraph.Measure(availableSize); _childGraph.Measure(availableSize);
_childGraph.Reset(false); _childGraph.Reset(false);
var boundingSize = _childGraph.GetBoundingSize(Width.IsNaN(), Height.IsNaN()); var boundingSize = _childGraph.GetBoundingSize(Width.IsNaN(), Height.IsNaN(), availableSize);
_childGraph.Reset(); _childGraph.Reset();
_childGraph.Measure(boundingSize); _childGraph.Measure(boundingSize);
return boundingSize; return boundingSize;
@ -286,6 +286,8 @@ namespace Avalonia.Controls
private void MeasureChild(GraphNode node) private void MeasureChild(GraphNode node)
{ {
var availableSize = AvailableSize;
var child = node.Element; var child = node.Element;
child.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity)); child.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
node.OriginDesiredSize = child.DesiredSize; node.OriginDesiredSize = child.DesiredSize;
@ -328,10 +330,10 @@ namespace Avalonia.Controls
: node.AlignBottomWithNode.Bottom * 0.5; : node.AlignBottomWithNode.Bottom * 0.5;
} }
var availableHeight = AvailableSize.Height - node.Top - node.Bottom; var availableHeight = availableSize.Height - node.Top - node.Bottom;
if (availableHeight.IsNaN()) if (availableHeight.IsNaN())
{ {
availableHeight = AvailableSize.Height; availableHeight = availableSize.Height;
if (!node.Top.IsNaN() && node.Bottom.IsNaN()) if (!node.Top.IsNaN() && node.Bottom.IsNaN())
{ {
@ -343,10 +345,10 @@ namespace Avalonia.Controls
} }
} }
var availableWidth = AvailableSize.Width - node.Left - node.Right; var availableWidth = availableSize.Width - node.Left - node.Right;
if (availableWidth.IsNaN()) if (availableWidth.IsNaN())
{ {
availableWidth = AvailableSize.Width; availableWidth = availableSize.Width;
if (!node.Left.IsNaN() && node.Right.IsNaN()) if (!node.Left.IsNaN() && node.Right.IsNaN())
{ {
@ -380,7 +382,7 @@ namespace Avalonia.Controls
if (node.Left.IsNaN()) if (node.Left.IsNaN())
{ {
node.Left = AvailableSize.Width - node.RightOfNode.Right; node.Left = availableSize.Width - node.RightOfNode.Right;
} }
} }
@ -393,14 +395,14 @@ namespace Avalonia.Controls
if (node.Top.IsNaN()) if (node.Top.IsNaN())
{ {
node.Top = AvailableSize.Height - node.BelowNode.Bottom; node.Top = availableSize.Height - node.BelowNode.Bottom;
} }
} }
if (node.AlignHorizontalCenterWith != null) if (node.AlignHorizontalCenterWith != null)
{ {
var halfWidthLeft = (AvailableSize.Width + node.AlignHorizontalCenterWith.Left - node.AlignHorizontalCenterWith.Right - childSize.Width) * 0.5; var halfWidthLeft = (availableSize.Width + node.AlignHorizontalCenterWith.Left - node.AlignHorizontalCenterWith.Right - childSize.Width) * 0.5;
var halfWidthRight = (AvailableSize.Width - node.AlignHorizontalCenterWith.Left + node.AlignHorizontalCenterWith.Right - childSize.Width) * 0.5; var halfWidthRight = (availableSize.Width - node.AlignHorizontalCenterWith.Left + node.AlignHorizontalCenterWith.Right - childSize.Width) * 0.5;
if (node.Left.IsNaN()) if (node.Left.IsNaN())
node.Left = halfWidthLeft; node.Left = halfWidthLeft;
@ -415,8 +417,8 @@ namespace Avalonia.Controls
if (node.AlignVerticalCenterWith != null) if (node.AlignVerticalCenterWith != null)
{ {
var halfHeightTop = (AvailableSize.Height + node.AlignVerticalCenterWith.Top - node.AlignVerticalCenterWith.Bottom - childSize.Height) * 0.5; var halfHeightTop = (availableSize.Height + node.AlignVerticalCenterWith.Top - node.AlignVerticalCenterWith.Bottom - childSize.Height) * 0.5;
var halfHeightBottom = (AvailableSize.Height - node.AlignVerticalCenterWith.Top + node.AlignVerticalCenterWith.Bottom - childSize.Height) * 0.5; var halfHeightBottom = (availableSize.Height - node.AlignVerticalCenterWith.Top + node.AlignVerticalCenterWith.Bottom - childSize.Height) * 0.5;
if (node.Top.IsNaN()) if (node.Top.IsNaN())
node.Top = halfHeightTop; node.Top = halfHeightTop;
@ -431,7 +433,7 @@ namespace Avalonia.Controls
if (GetAlignHorizontalCenterWithPanel(child)) if (GetAlignHorizontalCenterWithPanel(child))
{ {
var halfSubWidth = (AvailableSize.Width - childSize.Width) * 0.5; var halfSubWidth = (availableSize.Width - childSize.Width) * 0.5;
if (node.Left.IsNaN()) if (node.Left.IsNaN())
node.Left = halfSubWidth; node.Left = halfSubWidth;
@ -446,7 +448,7 @@ namespace Avalonia.Controls
if (GetAlignVerticalCenterWithPanel(child)) if (GetAlignVerticalCenterWithPanel(child))
{ {
var halfSubHeight = (AvailableSize.Height - childSize.Height) * 0.5; var halfSubHeight = (availableSize.Height - childSize.Height) * 0.5;
if (node.Top.IsNaN()) if (node.Top.IsNaN())
node.Top = halfSubHeight; node.Top = halfSubHeight;
@ -462,37 +464,37 @@ namespace Avalonia.Controls
if (node.Left.IsNaN()) if (node.Left.IsNaN())
{ {
if (!node.Right.IsNaN()) if (!node.Right.IsNaN())
node.Left = AvailableSize.Width - node.Right - childSize.Width; node.Left = availableSize.Width - node.Right - childSize.Width;
else else
{ {
node.Left = 0; node.Left = 0;
node.Right = AvailableSize.Width - childSize.Width; node.Right = availableSize.Width - childSize.Width;
} }
} }
else if (!node.Left.IsNaN() && node.Right.IsNaN()) else if (!node.Left.IsNaN() && node.Right.IsNaN())
{ {
node.Right = AvailableSize.Width - node.Left - childSize.Width; node.Right = availableSize.Width - node.Left - childSize.Width;
} }
if (node.Top.IsNaN()) if (node.Top.IsNaN())
{ {
if (!node.Bottom.IsNaN()) if (!node.Bottom.IsNaN())
node.Top = AvailableSize.Height - node.Bottom - childSize.Height; node.Top = availableSize.Height - node.Bottom - childSize.Height;
else else
{ {
node.Top = 0; node.Top = 0;
node.Bottom = AvailableSize.Height - childSize.Height; node.Bottom = availableSize.Height - childSize.Height;
} }
} }
else if (!node.Top.IsNaN() && node.Bottom.IsNaN()) else if (!node.Top.IsNaN() && node.Bottom.IsNaN())
{ {
node.Bottom = AvailableSize.Height - node.Top - childSize.Height; node.Bottom = availableSize.Height - node.Top - childSize.Height;
} }
node.Measured = true; node.Measured = true;
} }
public Size GetBoundingSize(bool calcWidth, bool calcHeight) public Size GetBoundingSize(bool calcWidth, bool calcHeight, Size availableSize)
{ {
var boundingSize = new Size(); var boundingSize = new Size();
@ -503,8 +505,8 @@ namespace Avalonia.Controls
boundingSize = boundingSize.WithHeight(Math.Max(boundingSize.Height, size.Height)); boundingSize = boundingSize.WithHeight(Math.Max(boundingSize.Height, size.Height));
} }
boundingSize = boundingSize.WithWidth(calcWidth ? boundingSize.Width : AvailableSize.Width); boundingSize = boundingSize.WithWidth(calcWidth ? Math.Max(availableSize.Width, boundingSize.Width) : availableSize.Width);
boundingSize = boundingSize.WithHeight(calcHeight ? boundingSize.Height : AvailableSize.Height); boundingSize = boundingSize.WithHeight(calcHeight ? Math.Max(availableSize.Height, boundingSize.Height) : availableSize.Height);
return boundingSize; return boundingSize;
} }
} }

Write Preview
Loading…
Cancel
Save