Browse Source

white space.

pull/1497/head
Dan Walmsley 8 years ago
parent
commit
8d07861e59
  1. 4
      src/Avalonia.Controls/Border.cs
  2. 4
      src/Avalonia.Controls/Presenters/ContentPresenter.cs
  3. 6
      tests/Avalonia.Controls.UnitTests/BorderTests.cs

4
src/Avalonia.Controls/Border.cs

@ -110,11 +110,11 @@ namespace Avalonia.Controls
{ {
if (Child != null) if (Child != null)
{ {
var padding = Padding + BorderThickness; var padding = Padding + BorderThickness;
Child.Arrange(new Rect(finalSize).Deflate(padding)); Child.Arrange(new Rect(finalSize).Deflate(padding));
} }
_borderRenderHelper.Update(finalSize, BorderThickness, CornerRadius); _borderRenderHelper.Update(finalSize, BorderThickness, CornerRadius);
return finalSize; return finalSize;
} }

4
src/Avalonia.Controls/Presenters/ContentPresenter.cs

@ -383,10 +383,10 @@ namespace Avalonia.Controls.Presenters
{ {
size = size.WithWidth(Math.Min(size.Width, DesiredSize.Width - padding.Left - padding.Right)); size = size.WithWidth(Math.Min(size.Width, DesiredSize.Width - padding.Left - padding.Right));
} }
if (verticalContentAlignment != VerticalAlignment.Stretch) if (verticalContentAlignment != VerticalAlignment.Stretch)
{ {
size = size.WithHeight(Math.Min(size.Height, DesiredSize.Height - padding.Top - padding.Bottom)); size = size.WithHeight(Math.Min(size.Height, DesiredSize.Height - padding.Top - padding.Bottom));
} }
if (useLayoutRounding) if (useLayoutRounding)

6
tests/Avalonia.Controls.UnitTests/BorderTests.cs

@ -33,11 +33,11 @@ namespace Avalonia.Controls.UnitTests
MaxWidth = 12, MaxWidth = 12,
Child = content = new Border Child = content = new Border
{ {
Height = 0, Height = 0,
Width = 0 Width = 0
} }
}; };
target.Arrange(new Rect(0, 0, 100, 100)); target.Arrange(new Rect(0, 0, 100, 100));
Assert.Equal(new Rect(6, 6, 0, 0), content.Bounds); Assert.Equal(new Rect(6, 6, 0, 0), content.Bounds);

Loading…
Cancel
Save