Browse Source

Fix image arrange.

`Image` was calculating its desired size correctly according to the value of `Stretch` but then was not applying that calculation to the arrange pass.

Fixes #2260
pull/2262/head
Steven Kirk 8 years ago
parent
commit
3ee48b25e4
  1. 17
      src/Avalonia.Controls/Image.cs

17
src/Avalonia.Controls/Image.cs

@ -99,5 +99,22 @@ namespace Avalonia.Controls
return new Size(); return new Size();
} }
} }
/// <inheritdoc/>
protected override Size ArrangeOverride(Size finalSize)
{
var source = Source;
if (source != null)
{
var sourceSize = new Size(source.PixelSize.Width, source.PixelSize.Height);
var result = Stretch.CalculateSize(finalSize, sourceSize);
return result;
}
else
{
return new Size();
}
}
} }
} }

Loading…
Cancel
Save