Merge pull request #174 from SixLabors/js/horizontal-alignment

Fix Horizontal Alignment
SixLabors · May 13, 2021 · 1aab62a · 1aab62a
2 parents 5b7a13c + 07a352e
commit 1aab62a
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/src/SixLabors.Fonts/TextLayout.cs b/src/SixLabors.Fonts/TextLayout.cs
@@ -36,9 +36,19 @@ public IReadOnlyList<GlyphLayout> GenerateLayout(ReadOnlySpan<char> text, Render
             float originX = 0;
             if (options.WrappingWidth > 0)
             {
-                // trim trailing white spaces from the text
+                // Trim trailing white spaces from the text
                 text = text.TrimEnd(null);
                 maxWidth = options.WrappingWidth / options.DpiX;
+
+                switch (options.HorizontalAlignment)
+                {
+                    case HorizontalAlignment.Right:
+                        originX = maxWidth;
+                        break;
+                    case HorizontalAlignment.Center:
+                        originX = maxWidth * .5F;
+                        break;
+                }
             }
 
             int codePointCount = CodePoint.GetCodePointCount(text);
@@ -134,7 +144,7 @@ public IReadOnlyList<GlyphLayout> GenerateLayout(ReadOnlySpan<char> text, Render
                             top = lineMaxAscender;
                             break;
                         case VerticalAlignment.Center:
-                            top = (lineMaxAscender / 2F) - (lineMaxDescender / 2F);
+                            top = (lineMaxAscender * .5F) - (lineMaxDescender * .5F);
                             break;
                         case VerticalAlignment.Bottom:
                             top = -lineMaxDescender;
@@ -338,7 +348,7 @@ public IReadOnlyList<GlyphLayout> GenerateLayout(ReadOnlySpan<char> text, Render
             switch (options.VerticalAlignment)
             {
                 case VerticalAlignment.Center:
-                    offsetY += new Vector2(0, -(totalHeight / 2F));
+                    offsetY += new Vector2(0, -(totalHeight * .5F));
                     break;
                 case VerticalAlignment.Bottom:
                     offsetY += new Vector2(0, -totalHeight);
@@ -378,7 +388,7 @@ public IReadOnlyList<GlyphLayout> GenerateLayout(ReadOnlySpan<char> text, Render
                             offsetX = new Vector2(originX - width, 0) + offsetY;
                             break;
                         case HorizontalAlignment.Center:
-                            offsetX = new Vector2(originX - (width / 2F), 0) + offsetY;
+                            offsetX = new Vector2(originX - (width * .5F), 0) + offsetY;
                             break;
                     }
                 }