Fix text extents width for unix

klsruan · klsruan · commit 3d72fd83a9d0 · 2024-11-29T15:28:58.000-03:00
diff --git a/modules/ILL/ILL.moon b/modules/ILL/ILL.moon
@@ -1,4 +1,4 @@
-module_version = "1.5.2"
+module_version = "1.5.3"
 
 haveDepCtrl, DependencyControl = pcall require, "l0.DependencyControl"
 
diff --git a/modules/ILL/ILL/Font/Unx.moon b/modules/ILL/ILL/Font/Unx.moon
@@ -625,7 +625,7 @@ class FreeType extends Init
 	getTextExtents: (text) =>
 		face_size, width = @face[0].size.face, 0
 		@callBackChars text, (ci, char, glyph) ->
-			width += tonumber(glyph.metrics.horiAdvance) + (ci > 1 and @hspace * FONT_UPSCALE or 0)
+			width += tonumber(glyph.metrics.horiAdvance) + (@hspace * FONT_UPSCALE)
 		{
 			width: (width / FONT_UPSCALE) * @xscale
 			height: @height * @yscale

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module_version = "1.5.2"`
	`1`	`+module_version = "1.5.3"`
`2`	`2`
`3`	`3`	`haveDepCtrl, DependencyControl = pcall require, "l0.DependencyControl"`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -625,7 +625,7 @@ class FreeType extends Init`
`625`	`625`	`getTextExtents: (text) =>`
`626`	`626`	`face_size, width = @face[0].size.face, 0`
`627`	`627`	`@callBackChars text, (ci, char, glyph) ->`
`628`		`- width += tonumber(glyph.metrics.horiAdvance) + (ci > 1 and @hspace * FONT_UPSCALE or 0)`
	`628`	`+ width += tonumber(glyph.metrics.horiAdvance) + (@hspace * FONT_UPSCALE)`
`629`	`629`	`{`
`630`	`630`	`width: (width / FONT_UPSCALE) * @xscale`
`631`	`631`	`height: @height * @yscale`