Merge pull request #181 from SixLabors/js/fix-textbuilder

Remove double origin assignment from TextBuilder

Author: JimBobSquarePants

src/ImageSharp.Drawing/ImageSharp.Drawing.csproj

@@ -20,8 +20,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta15.20" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" />
+    <PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta15.23" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="2.0.0-alpha.0.123" />
   </ItemGroup>
 
   <Import Project="..\..\shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems" Label="Shared" />

src/ImageSharp.Drawing/Shapes/Text/TextBuilder.cs

@@ -19,7 +19,7 @@ public static class TextBuilder
         /// <returns>The <see cref="IPathCollection"/></returns>
         public static IPathCollection GenerateGlyphs(string text, TextOptions textOptions)
         {
-            GlyphBuilder glyphBuilder = new(textOptions.Origin);
+            GlyphBuilder glyphBuilder = new();
             TextRenderer renderer = new(glyphBuilder);
 
             renderer.RenderText(text, textOptions);

tests/ImageSharp.Drawing.Tests/ConfigurationTests.cs

@@ -20,7 +20,7 @@ public class ConfigurationTests
 
         public Configuration DefaultConfiguration { get; }
 
-        private readonly int expectedDefaultConfigurationCount = 5;
+        private readonly int expectedDefaultConfigurationCount = 7;
 
         public ConfigurationTests()
         {

tests/ImageSharp.Drawing.Tests/Shapes/TextBuilderTests.cs

@@ -0,0 +1,34 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+
+using System.Numerics;
+using SixLabors.Fonts;
+using Xunit;
+
+namespace SixLabors.ImageSharp.Drawing.Tests.Shapes
+{
+    public class TextBuilderTests
+    {
+        [Fact]
+        public void TextBuilder_Bounds_AreCorrect()
+        {
+            Vector2 position = new(5, 5);
+            var options = new TextOptions(TestFontUtilities.GetFont(TestFonts.OpenSans, 16))
+            {
+                Origin = position
+            };
+
+            string text = "Hello World";
+
+            IPathCollection glyphs = TextBuilder.GenerateGlyphs(text, options);
+
+            RectangleF builderBounds = glyphs.Bounds;
+            FontRectangle measuredBounds = TextMeasurer.MeasureBounds(text, options);
+
+            Assert.Equal(measuredBounds.X, builderBounds.X);
+            Assert.Equal(measuredBounds.Y, builderBounds.Y);
+            Assert.Equal(measuredBounds.Width, builderBounds.Width);
+            Assert.Equal(measuredBounds.Height, builderBounds.Height);
+        }
+    }
+}