Browse Source

Fix Image measurement.

pull/145/head
Steven Kirk 11 years ago
parent
commit
e354887311
  1. 25
      src/Perspex.Controls/Image.cs

25
src/Perspex.Controls/Image.cs

@ -73,29 +73,14 @@ namespace Perspex.Controls
/// <returns>The desired size of the control.</returns> /// <returns>The desired size of the control.</returns>
protected override Size MeasureOverride(Size availableSize) protected override Size MeasureOverride(Size availableSize)
{ {
double width = 0;
double height = 0;
Vector scale = new Vector();
if (Source != null) if (Source != null)
{ {
width = Source.PixelWidth; return new Size(Source.PixelWidth, Source.PixelHeight);
height = Source.PixelHeight; }
else
if (Width > 0) {
{ return new Size();
availableSize = new Size(Width, availableSize.Height);
}
if (Height > 0)
{
availableSize = new Size(availableSize.Width, Height);
}
scale = Stretch.CalculateScaling(availableSize, new Size(width, height));
} }
return new Size(width * scale.X, height * scale.Y);
} }
} }
} }
Loading…
Cancel
Save