From 614bd5d72566b75627fa5aa4087a3a2c7a305f6e Mon Sep 17 00:00:00 2001 From: Chris Feger Date: Thu, 13 Jan 2022 11:18:56 -0700 Subject: [PATCH] Fix scaling issue for C2D_Text with font info --- source/text.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/source/text.c b/source/text.c index b4caa1a..4cb6620 100644 --- a/source/text.c +++ b/source/text.c @@ -321,18 +321,19 @@ void C2D_DrawText(const C2D_Text* text, u32 flags, float x, float y, float z, fl C2Di_Glyph* cur; CFNT_s* systemFont = fontGetSystemFont(); - scaleX *= s_textScale; - scaleY *= s_textScale; - float glyphZ = z; float glyphH; float dispY; if (text->font) { + scaleX *= text->font->textScale; + scaleY *= text->font->textScale; glyphH = scaleY*text->font->cfnt->finf.tglp->cellHeight; dispY = ceilf(scaleY*text->font->cfnt->finf.lineFeed); } else { + scaleX *= s_textScale; + scaleY *= s_textScale; glyphH = scaleY*fontGetGlyphInfo(systemFont)->cellHeight; dispY = ceilf(scaleY*fontGetInfo(systemFont)->lineFeed); }