From fad7966fc46505603d0406f10b7e2c10c7f622cc Mon Sep 17 00:00:00 2001 From: Huang Xin Date: Thu, 4 Dec 2025 13:56:23 +0800 Subject: [PATCH] fix(layout): auto two-column layout for unfolded screen, closes #2588 (#2615) --- apps/readest-app/src/utils/config.ts | 11 ++++++++--- packages/foliate-js | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/apps/readest-app/src/utils/config.ts b/apps/readest-app/src/utils/config.ts index 460612bd..bc8f9257 100644 --- a/apps/readest-app/src/utils/config.ts +++ b/apps/readest-app/src/utils/config.ts @@ -1,13 +1,18 @@ import { ViewSettings } from '@/types/book'; export const getMaxInlineSize = (viewSettings: ViewSettings) => { - const isVertical = viewSettings.vertical!; + const isVertical = viewSettings.vertical; const screenWidth = window.innerWidth; const screenHeight = window.innerHeight; - return isVertical && false + const screenAspectRatio = isVertical ? screenHeight / screenWidth : screenWidth / screenHeight; + const isUnfoldedScreen = screenAspectRatio < 1.3 && screenAspectRatio > 0.77 && screenWidth > 600; + + return isVertical ? Math.max(screenWidth, screenHeight, 720) - : viewSettings.maxInlineSize!; + : isUnfoldedScreen + ? viewSettings.maxInlineSize * 0.8 + : viewSettings.maxInlineSize; }; export const getDefaultMaxInlineSize = () => { diff --git a/packages/foliate-js b/packages/foliate-js index a6b6252d..0fc05afe 160000 --- a/packages/foliate-js +++ b/packages/foliate-js @@ -1 +1 @@ -Subproject commit a6b6252d7c1fa2c30556f1ba2c69338ab1972b62 +Subproject commit 0fc05afef443f3dd5c69b48fadd8ddc248c5199a