From dee4871f911add320669da605d646d836dba8f8a Mon Sep 17 00:00:00 2001 From: bunnie Date: Thu, 6 Jul 2023 16:15:49 +0800 Subject: [PATCH] fix truncated "l" in some cases on wide fonts minimum width should not be truncated to 0 during layout! --- services/graphics-server/src/blitstr2/blit.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/graphics-server/src/blitstr2/blit.rs b/services/graphics-server/src/blitstr2/blit.rs index 96b2322c8..f25bb6917 100644 --- a/services/graphics-server/src/blitstr2/blit.rs +++ b/services/graphics-server/src/blitstr2/blit.rs @@ -126,7 +126,7 @@ pub fn xor_glyph_large(fb: &mut FrBuf, p: &Point, gs: GlyphSprite, xor: bool, cr return; } let high = gs.high as i16 / 2; - let wide = gs.wide as i16 / 2; + let wide = (gs.wide as i16 / 2).max(1); if high > SPRITE_PX || wide > SPRITE_PX { // Fail silently if glyph height or width is out of spec // TODO: Maybe return an error? @@ -206,7 +206,7 @@ pub fn xor_glyph_2x(fb: &mut FrBuf, p: &Point, gs: GlyphSprite, xor: bool, cr: C return; } let high = gs.high as i16 / 2; - let wide = gs.wide as i16 / 2; + let wide = (gs.wide as i16 / 2).max(1); if high > SPRITE_PX || wide > SPRITE_PX { // Fail silently if glyph height or width is out of spec // TODO: Maybe return an error?