From f0f451ce4a75d95f9a26289578c064f99b9a0269 Mon Sep 17 00:00:00 2001 From: Bubble <1282505255@qq.com> Date: Wed, 2 Apr 2025 02:04:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AD=97=E4=BD=93=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=BC=BA=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/chinese_text.c | 8 ++------ src/text.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/chinese_text.c b/src/chinese_text.c index 4493272774..d2685bf67b 100644 --- a/src/chinese_text.c +++ b/src/chinese_text.c @@ -54,13 +54,9 @@ u8 GetChineseFontWidthFunc(u8 fontId) { case FONT_SMALL: case FONT_SMALL_NARROW: + case FONT_SMALL_NARROWER: return 10; - case FONT_NORMAL: - case FONT_SHORT: - case FONT_SHORT_COPY_1: - case FONT_SHORT_COPY_2: - case FONT_SHORT_COPY_3: - case FONT_NARROW: + default: return 12; } return 0; diff --git a/src/text.c b/src/text.c index cf068a46ec..92998c3f6d 100644 --- a/src/text.c +++ b/src/text.c @@ -1266,6 +1266,18 @@ static u16 RenderText(struct TextPrinter *textPrinter) case FONT_SMALL_NARROW: DecompressGlyph_SmallNarrow(currChar, textPrinter->japanese); break; + case FONT_NARROWER: + DecompressGlyph_Narrower(currChar, textPrinter->japanese); + break; + case FONT_SMALL_NARROWER: + DecompressGlyph_SmallNarrower(currChar, textPrinter->japanese); + break; + case FONT_SHORT_NARROW: + DecompressGlyph_ShortNarrow(currChar, textPrinter->japanese); + break; + case FONT_SHORT_NARROWER: + DecompressGlyph_ShortNarrower(currChar, textPrinter->japanese); + break; case FONT_BRAILLE: break; }