From 7fd12ec12784f2712d21d7695b1fed102b01163b Mon Sep 17 00:00:00 2001 From: sogav21 <223452947+sogav21@users.noreply.github.com> Date: Wed, 4 Nov 2026 21:30:41 +0200 Subject: [PATCH] Measure ASCII glyph widths when the width table is unavailable --- src/contain/text.ts | 2 +- .../ut/spec/graphic/TextWidthFallback.test.ts | 32 +++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 test/ut/spec/graphic/TextWidthFallback.test.ts diff --git a/src/contain/text.ts b/src/contain/text.ts index cdafcd6d8..16b7787a7 100644 --- a/src/contain/text.ts +++ b/src/contain/text.ts @@ -89,7 +89,7 @@ export function measureCharWidth(fontMeasureInfo: FontMeasureInfo, charCode: num return (0 <= charCode && charCode <= 127) ? (fontMeasureInfo.asciiWidthMap != null ? fontMeasureInfo.asciiWidthMap[charCode] - : fontMeasureInfo.asciiCharWidth + : measureWidth(fontMeasureInfo, String.fromCharCode(charCode)) ) : fontMeasureInfo.stWideCharWidth; } diff --git a/test/ut/spec/graphic/TextWidthFallback.test.ts b/test/ut/spec/graphic/TextWidthFallback.test.ts new file mode 100644 index 000000000..aa0bfba8e --- /dev/null +++ b/test/ut/spec/graphic/TextWidthFallback.test.ts @@ -0,0 +1,32 @@ +import { platformApi } from '../../../../src/core/platform'; +import { parsePlainText } from '../../../../src/graphic/helper/parseText'; + +describe('slow ASCII width map fallback', () => { + it('uses cached widths of actual characters for subsequent fonts', () => { + jest.useFakeTimers(); + const originalMeasureText = platformApi.measureText; + const counts: Record = {}; + platformApi.measureText = (text, font) => { + const key = font + ':' + text; + counts[key] = (counts[key] || 0) + 1; + if (font === 'slow-test-font' && text === '\0') { + jest.advanceTimersByTime(17); + } + return {width: Array.from(text).reduce((sum, ch) => sum + (ch === 'i' ? 1 : ch === 'W' ? 10 : 5), 0)}; + }; + try { + parsePlainText('warmup', {font: 'slow-test-font', width: 100, overflow: 'breakAll'}, null, null); + const style = {font: 'later-test-font', width: 12, overflow: 'breakAll' as const}; + const first = parsePlainText('iiiiWWWW', style, null, null); + expect(first.lines).toEqual(['iiii', 'W', 'W', 'W', 'W']); + const second = parsePlainText('iiiiWWWW', style, null, null); + expect(second.lines).toEqual(first.lines); + expect(counts['later-test-font:i']).toBe(1); + expect(counts['later-test-font:W']).toBe(1); + } + finally { + platformApi.measureText = originalMeasureText; + jest.useRealTimers(); + } + }); +});