Skip to content

Fix Vertical Layout with Custom LineSpacing #500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JimBobSquarePants merged 2 commits into from
Mar 2, 2026
+8 −6
Merged

Fix Vertical Layout with Custom LineSpacing #500

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a447514
Fix vertical layout centering with line spacing
JimBobSquarePants Mar 2, 2026
cf8b302
Merge branch 'main' into js/linemetrics
JimBobSquarePants Mar 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/SixLabors.Fonts/TextLayout.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,8 @@ private static List<GlyphLayout> LayoutLineVertical(
penLocation.Y += offsetY;
penLocation.X += offsetX;

float lineOriginX = penLocation.X;

List<GlyphLayout> glyphs = new(textLine.Count);

// Grapheme-scoped state for transformed glyph alignment.
Expand Down Expand Up @@ -699,7 +701,7 @@ private static List<GlyphLayout> LayoutLineVertical(
// Normalize ink minX to 0 and center within the column width.
// This is grapheme-correct and avoids centering based only on the "first" entry,
// which is not representative for marks like reph in Devanagari.
currentGraphemeAlignX = -minX + ((scaledMaxLineHeight - inkWidth) * .5F);
currentGraphemeAlignX = -minX + ((unscaledLineHeight - inkWidth) * .5F);
}
}

Expand Down Expand Up @@ -740,7 +742,7 @@ private static List<GlyphLayout> LayoutLineVertical(
glyphs.Add(new GlyphLayout(
new Glyph(metric, data.PointSize),
boxLocation,
penLocation + new Vector2((scaledMaxLineHeight - data.ScaledLineHeight) * .5F, 0),
penLocation + new Vector2((unscaledLineHeight - (data.ScaledLineHeight / options.LineSpacing)) * .5F, 0),
offset,
advanceW,
data.ScaledAdvance + yExtraAdvance,
Expand All @@ -762,8 +764,8 @@ private static List<GlyphLayout> LayoutLineVertical(
if (data.IsLastInGrapheme)
{
penLocation.Y += data.ScaledAdvance + yExtraAdvance;
boxLocation.X = originX;
penLocation.X = originX;
boxLocation.X = lineOriginX;
penLocation.X = lineOriginX;
}
}

Expand Down Expand Up @@ -921,7 +923,7 @@ private static List<GlyphLayout> LayoutLineVerticalMixed(
// - Take half the difference between the max line height (scaledMaxLineHeight)
// and the current glyph's line height (data.ScaledLineHeight).
// - The line height includes both ascender and descender metrics.
float baselineDelta = (scaledMaxLineHeight - data.ScaledLineHeight) * .5F;
float baselineDelta = (unscaledLineHeight - (data.ScaledLineHeight / options.LineSpacing)) * .5F;

// Adjust the horizontal offset further by considering the descender differences:
// - Subtract the current glyph's descender (data.ScaledDescender) to align it properly.
Expand Down Expand Up @@ -962,7 +964,7 @@ private static List<GlyphLayout> LayoutLineVerticalMixed(
glyphs.Add(new GlyphLayout(
new Glyph(metric, data.PointSize),
boxLocation,
penLocation + new Vector2((scaledMaxLineHeight - data.ScaledLineHeight) * .5F, 0),
penLocation + new Vector2((unscaledLineHeight - (data.ScaledLineHeight / options.LineSpacing)) * .5F, 0),
offset,
advanceX,
data.ScaledAdvance + yExtraAdvance,
Expand Down
Loading