Merge pull request #2126 from steveRoll-git/main

Improve `"justify"` text alignment
love2d · Dec 25, 2024 · 8443928 · 8443928
2 parents 7076688 + d4a2c46
commit 8443928
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/src/modules/font/GenericShaper.cpp b/src/modules/font/GenericShaper.cpp
@@ -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;
 	}

diff --git a/src/modules/font/freetype/HarfbuzzShaper.cpp b/src/modules/font/freetype/HarfbuzzShaper.cpp
@@ -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);
+			}
 		}
 	}
 

diff --git a/src/modules/graphics/Font.cpp b/src/modules/graphics/Font.cpp
@@ -507,8 +507,12 @@ std::vector<Font::DrawCommand> Font::generateVerticesFormatted(const love::font:
 				auto start = text.cps.begin() + range.getOffset();
 				auto end = start + range.getSize();
 				float numspaces = std::count(start, end, ' ');
+
+				if (text.cps[range.last] == ' ')
+					--numspaces;
+
 				if (width < wrap && numspaces >= 1)
-					extraspacing = floorf((wrap - width) / numspaces);
+					extraspacing = (wrap - width) / numspaces;
 				else
 					extraspacing = 0.0f;
 				break;