LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-17 11:00:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve justified text alignment

Browse Source
This commit is contained in:
Ron Tseytlin
2024-12-16 21:42:42 +02:00
parent 486cc22dbd
commit 7e34e0ad21
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/font/GenericShaper.cpp
+6 -1
View File
@@ -49,6 +49,7 @@ void GenericShaper::computeGlyphPositions(const ColoredCodepoints &codepoints, R
// Spacing counter and newline handling.
Vector2 curpos = offset;
float spacingremainder = 0;
float maxwidth = 0;
uint32 prevglyph = 0;
@@ -125,7 +126,11 @@ void GenericShaper::computeGlyphPositions(const ColoredCodepoints &codepoints, R
// Account for extra spacing given to space characters.
if (g == ' ' && extraspacing != 0.0f)
curpos.x += extraspacing;
{
spacingremainder += fmod(extraspacing, 1);
curpos.x += floorf(extraspacing) + floorf(spacingremainder);
spacingremainder = fmod(spacingremainder, 1);
}
prevglyph = g;
}
src/modules/font/freetype/HarfbuzzShaper.cpp
+6 -1
View File
@@ -208,6 +208,7 @@ void HarfbuzzShaper::computeGlyphPositions(const ColoredCodepoints &codepoints,
offset.y += getBaseline();
Vector2 curpos = offset;
float spacingremainder = 0;
int colorindex = 0;
int ncolors = (int)codepoints.colors.size();
@@ -312,7 +313,11 @@ void HarfbuzzShaper::computeGlyphPositions(const ColoredCodepoints &codepoints,
// Account for extra spacing given to space characters.
if (clustercodepoint == ' ' && extraspacing != 0.0f)
curpos.x += extraspacing;
{
spacingremainder += fmod(extraspacing, 1);
curpos.x += floorf(extraspacing) + floorf(spacingremainder);
spacingremainder = fmod(spacingremainder, 1);
}
}
}