Browse Source

Prevent text measuring as NaN.

When text is right-aligned, WidthIncludingTrailingWhitespace seems to
return null. Worked around that but I think the layout code is wrong
now.
pull/58/head
Steven Kirk 12 years ago
parent
commit
47b23cec71
  1. 12
      Windows/Perspex.Direct2D1/Media/FormattedTextImpl.cs

12
Windows/Perspex.Direct2D1/Media/FormattedTextImpl.cs

@ -120,9 +120,15 @@ namespace Perspex.Direct2D1.Media
public Size Measure() public Size Measure()
{ {
return new Size( var metrics = this.TextLayout.Metrics;
this.TextLayout.Metrics.WidthIncludingTrailingWhitespace, var width = metrics.WidthIncludingTrailingWhitespace;
this.TextLayout.Metrics.Height);
if (float.IsNaN(width))
{
width = metrics.Width;
}
return new Size(width, this.TextLayout.Metrics.Height);
} }
public void SetForegroundBrush(Brush brush, int startIndex, int count) public void SetForegroundBrush(Brush brush, int startIndex, int count)

Loading…
Cancel
Save