From 9016933085285c42e783e347ff09b968c22e9b46 Mon Sep 17 00:00:00 2001 From: Benedikt Stebner Date: Thu, 2 Mar 2023 12:40:42 +0100 Subject: [PATCH] Fix some unit tests --- src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs | 2 +- tests/Avalonia.Skia.UnitTests/Media/GlyphRunTests.cs | 6 +++--- .../Media/TextFormatting/TextLayoutTests.cs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs index f9b5953e3f..87fa963871 100644 --- a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs +++ b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs @@ -387,7 +387,7 @@ namespace Avalonia.Direct2D1.Media /// The glyph run. public void DrawGlyphRun(IBrush foreground, IRef glyphRun) { - using (var brush = CreateBrush(foreground, glyphRun.Item.Size)) + using (var brush = CreateBrush(foreground, glyphRun.Item.Bounds.Size)) { var glyphRunImpl = (GlyphRunImpl)glyphRun.Item; diff --git a/tests/Avalonia.Skia.UnitTests/Media/GlyphRunTests.cs b/tests/Avalonia.Skia.UnitTests/Media/GlyphRunTests.cs index c89fe9c09a..acdc242f0d 100644 --- a/tests/Avalonia.Skia.UnitTests/Media/GlyphRunTests.cs +++ b/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 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(glyphRun.GlyphInfos!.Count); diff --git a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs index 817da33e1c..a24da38fdd 100644 --- a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs +++ b/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 _);