From ba125ad4136467968185f9926ec30f3ca2051b63 Mon Sep 17 00:00:00 2001 From: James Babcock Date: Sat, 17 Oct 2026 15:01:58 -0700 Subject: [PATCH] Fix a crash in the onboarding flow --- app/apps/onboarding/display-mode-page.ts | 3 ++- app/apps/onboarding/text-size-page.ts | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/apps/onboarding/display-mode-page.ts b/app/apps/onboarding/display-mode-page.ts index b9d0a8e2..5f449478 100644 --- a/app/apps/onboarding/display-mode-page.ts +++ b/app/apps/onboarding/display-mode-page.ts @@ -48,7 +48,8 @@ export class DisplayModePage implements OnboardingPage { "Swipe to choose how much of the display windows use; it changes as you go. Tap to continue.", ) + CONTENT_GAP; const body = onboardingFont("body"); - const columnWidth = 20 + Math.max(...this.menu.items.map((value) => body.measureText(displayLayoutSetting.displayValue(value)))); + // TTF widths are fractional; the menu's row images need whole pixels. + const columnWidth = Math.ceil(20 + Math.max(...this.menu.items.map((value) => body.measureText(displayLayoutSetting.displayValue(value))))); const menuBox = { x: PAGE_X - 10, y: top, width: columnWidth, height: image.height - top - BOTTOM_MARGIN }; this.menu.paint(image, menuBox, focused); const layout = this.menu.selectedItem; diff --git a/app/apps/onboarding/text-size-page.ts b/app/apps/onboarding/text-size-page.ts index 4c67627c..46498f45 100644 --- a/app/apps/onboarding/text-size-page.ts +++ b/app/apps/onboarding/text-size-page.ts @@ -99,8 +99,9 @@ export class TextSizePage implements OnboardingPage { ) + CONTENT_GAP; const height = image.height - top - BOTTOM_MARGIN; const body = onboardingFont("body"); - const columnWidth = 20 + Math.max(...this.face.sizes.map((size) => body.measureText(sizeLabel(size)))) + - NOTE_GAP + onboardingFont("detail").measureText(RECOMMENDED_NOTE); + // TTF widths are fractional; the menu's row images need whole pixels. + const columnWidth = Math.ceil(20 + Math.max(...this.face.sizes.map((size) => body.measureText(sizeLabel(size)))) + + NOTE_GAP + onboardingFont("detail").measureText(RECOMMENDED_NOTE)); const menuBox = { x: PAGE_X - 10, y: top, width: columnWidth, height }; this.sizeMenu.paint(image, menuBox, focused); const previewX = menuBox.x + menuBox.width + COLUMN_GAP;