Browse Source

Fix some unit tests

pull/10530/head
Benedikt Stebner 3 years ago
parent
commit
9016933085
  1. 2
      src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
  2. 6
      tests/Avalonia.Skia.UnitTests/Media/GlyphRunTests.cs
  3. 2
      tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs

2
src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs

@ -387,7 +387,7 @@ namespace Avalonia.Direct2D1.Media
/// <param name="glyphRun">The glyph run.</param>
public void DrawGlyphRun(IBrush foreground, IRef<IGlyphRunImpl> glyphRun)
{
using (var brush = CreateBrush(foreground, glyphRun.Item.Size))
using (var brush = CreateBrush(foreground, glyphRun.Item.Bounds.Size))
{
var glyphRunImpl = (GlyphRunImpl)glyphRun.Item;

6
tests/Avalonia.Skia.UnitTests/Media/GlyphRunTests.cs

@ -110,7 +110,7 @@ namespace Avalonia.Skia.UnitTests.Media
if (glyphRun.IsLeftToRight)
{
var characterHit =
glyphRun.GetCharacterHitFromDistance(glyphRun.Size.Width, out _);
glyphRun.GetCharacterHitFromDistance(glyphRun.Bounds.Width, out _);
Assert.Equal(glyphRun.Characters.Length, characterHit.FirstCharacterIndex + characterHit.TrailingLength);
}
@ -157,9 +157,9 @@ namespace Avalonia.Skia.UnitTests.Media
private static List<Rect> BuildRects(GlyphRun glyphRun)
{
var height = glyphRun.Size.Height;
var height = glyphRun.Bounds.Height;
var currentX = glyphRun.IsLeftToRight ? 0d : glyphRun.Size.Width;
var currentX = glyphRun.IsLeftToRight ? 0d : glyphRun.Bounds.Width;
var rects = new List<Rect>(glyphRun.GlyphInfos!.Count);

2
tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs

@ -457,7 +457,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
var glyphRun = shapedRun.GlyphRun;
var width = glyphRun.Size.Width;
var width = glyphRun.Bounds.Width;
var characterHit = glyphRun.GetCharacterHitFromDistance(width, out _);

Loading…
Cancel
Save