summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas E. Dickey <dickey@invisible-island.net>2022-11-12 12:48:08 -0500
committerThomas E. Dickey <dickey@invisible-island.net>2022-11-12 12:49:16 -0500
commit98e27ba4b2c3a4825a3497cd481992374a9c9e98 (patch)
tree51377fef0090fb5c9b1b30702ab1c75aac69ddb6
parent6d246534bd156e5cb901b2cc9e2b9d473cf73506 (diff)
downloadxorg-lib-libXft-98e27ba4b2c3a4825a3497cd481992374a9c9e98.tar.gz
libxft issue #15
https://gitlab.freedesktop.org/xorg/lib/libxft/-/issues/15 XftFontLoadGlyphs for mono font returns wrong info in extents from XftTextExtentsUtf8 for variable chars Patch by Scott Mcdermott, based on https://github.com/googlefonts/Inconsolata/issues/42 Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net>
-rw-r--r--src/xftglyphs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xftglyphs.c b/src/xftglyphs.c
index 7f89e24..145828e 100644
--- a/src/xftglyphs.c
+++ b/src/xftglyphs.c
@@ -847,11 +847,11 @@ XftFontLoadGlyphs (Display *dpy,
if (font->info.load_flags & FT_LOAD_VERTICAL_LAYOUT)
{
xftg->metrics.xOff = 0;
- xftg->metrics.yOff = (short)(-font->public.max_advance_width);
+ xftg->metrics.yOff = -TRUNC(ROUND(glyphslot->advance.y));
}
else
{
- xftg->metrics.xOff = (short)(font->public.max_advance_width);
+ xftg->metrics.xOff = TRUNC(ROUND(glyphslot->advance.x));
xftg->metrics.yOff = 0;
}
}