From ffc21217c46310332ebcb02f3f458ed44d904542 Mon Sep 17 00:00:00 2001 From: dpjudas Date: Mon, 8 Jan 2024 16:11:30 +0100 Subject: [PATCH] Fix the LSB alignment and switch to the internal TTF implementation --- libraries/ZWidget/src/core/canvas.cpp | 2 +- libraries/ZWidget/src/core/truetypefont.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/ZWidget/src/core/canvas.cpp b/libraries/ZWidget/src/core/canvas.cpp index fe4e4153c..3c4337175 100644 --- a/libraries/ZWidget/src/core/canvas.cpp +++ b/libraries/ZWidget/src/core/canvas.cpp @@ -14,7 +14,7 @@ #include #include -// #define USE_INTERNAL_TTF +#define USE_INTERNAL_TTF class CanvasTexture { diff --git a/libraries/ZWidget/src/core/truetypefont.cpp b/libraries/ZWidget/src/core/truetypefont.cpp index 78178de04..07b599e28 100644 --- a/libraries/ZWidget/src/core/truetypefont.cpp +++ b/libraries/ZWidget/src/core/truetypefont.cpp @@ -276,7 +276,7 @@ TrueTypeGlyph TrueTypeFont::LoadGlyph(uint32_t glyphIndex, double height) const // TBD: gridfit or not? glyph.advanceWidth = (int)std::round(advanceWidth * scale * scaleX); - glyph.leftSideBearing = (int)std::round(lsb * scale * scaleX + bboxMin.x); + glyph.leftSideBearing = (int)std::round(bboxMin.x); glyph.yOffset = (int)std::round(bboxMin.y); return glyph;