text: fix bitmap y offset computation

This commit fixes a bug that would incorrectly baseline bitmap glyphs text if the line contained another font with a taller line height. The logic for computing the y offset of the glyph incorrectly assumed that the Glyph.Ascent was particular to the glyph instead of the line. I've updated it to use a glyph-specific value. Signed-off-by: Chris Waldon <[email protected]>
gioui · Jul 17, 2023 · 5606a96 · 5606a96
1 parent 6d925a1
commit 5606a96
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/text/gotext.go b/text/gotext.go
@@ -674,7 +674,7 @@ func (s *shaperImpl) Bitmaps(ops *op.Ops, gs []Glyph) op.CallOp {
 			}
 			off := op.Affine(f32.Affine2D{}.Offset(f32.Point{
 				X: fixedToFloat((g.X - x) - g.Offset.X),
-				Y: fixedToFloat(g.Offset.Y - g.Ascent),
+				Y: fixedToFloat(g.Offset.Y + g.Bounds.Min.Y),
 			})).Push(ops)
 			cl := clip.Rect{Max: imgSize}.Push(ops)