|
|
@ -255,17 +255,19 @@ namespace Avalonia.Controls |
|
|
|
|
|
|
|
|
if (fHorizontal) |
|
|
if (fHorizontal) |
|
|
{ |
|
|
{ |
|
|
rcChild = rcChild.WithX(rcChild.X + previousChildSize + spacing); |
|
|
rcChild = rcChild.WithX(rcChild.X + previousChildSize); |
|
|
previousChildSize = child.DesiredSize.Width;//+ (child.IsVisible ? spacing : 0);
|
|
|
previousChildSize = child.DesiredSize.Width; |
|
|
rcChild = rcChild.WithWidth(previousChildSize); |
|
|
rcChild = rcChild.WithWidth(previousChildSize); |
|
|
rcChild = rcChild.WithHeight(Math.Max(finalSize.Height, child.DesiredSize.Height)); |
|
|
rcChild = rcChild.WithHeight(Math.Max(finalSize.Height, child.DesiredSize.Height)); |
|
|
|
|
|
previousChildSize += spacing; |
|
|
} |
|
|
} |
|
|
else |
|
|
else |
|
|
{ |
|
|
{ |
|
|
rcChild = rcChild.WithY(rcChild.Y + previousChildSize + spacing); |
|
|
rcChild = rcChild.WithY(rcChild.Y + previousChildSize); |
|
|
previousChildSize = child.DesiredSize.Height;//+ (child.IsVisible ? spacing : 0);
|
|
|
previousChildSize = child.DesiredSize.Height; |
|
|
rcChild = rcChild.WithHeight(previousChildSize); |
|
|
rcChild = rcChild.WithHeight(previousChildSize); |
|
|
rcChild = rcChild.WithWidth(Math.Max(finalSize.Width, child.DesiredSize.Width)); |
|
|
rcChild = rcChild.WithWidth(Math.Max(finalSize.Width, child.DesiredSize.Width)); |
|
|
|
|
|
previousChildSize += spacing; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
child.Arrange(rcChild); |
|
|
child.Arrange(rcChild); |
|
|
|