From a3c28bbb4d86a8e04cc9c6ebe26c5779be48755e Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Tue, 9 Jan 2024 20:15:21 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20tab=20=E6=9C=80=E5=B0=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/boot/onGetConfig.ts | 4 +++-
 app/src/layout/util.ts      | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/boot/onGetConfig.ts b/app/src/boot/onGetConfig.ts
index 1f9fc94f3..5e384cd8c 100644
--- a/app/src/boot/onGetConfig.ts
+++ b/app/src/boot/onGetConfig.ts
@@ -126,7 +126,9 @@ export const onGetConfig = (isStart: boolean, app: App) => {
         window.siyuan.emojis = response.data as IEmoji[];
         try {
             JSONToLayout(app, isStart);
-            adjustLayout();
+            setTimeout(() => {
+                adjustLayout();
+            }); // 等待 dock 中 !this.pin 的 setTimeout
             /// #if !BROWSER
             sendGlobalShortcut(app);
             /// #endif
diff --git a/app/src/layout/util.ts b/app/src/layout/util.ts
index ee6ad3fb2..743a32ae7 100644
--- a/app/src/layout/util.ts
+++ b/app/src/layout/util.ts
@@ -876,7 +876,8 @@ export const adjustLayout = (layout: Layout = window.siyuan.layout.centerLayout.
         }
     });
     let lastItem: HTMLElement;
-    while (layout.element.scrollWidth > layout.element.clientWidth) {
+    let index = Math.floor(window.innerWidth / 24);
+    while (layout.element.scrollWidth > layout.element.clientWidth && index > 0) {
         layout.children.find((item: Layout | Wnd) => {
             if (item.element.style.width && item.element.style.width !== "0px") {
                 item.element.style.maxWidth = Math.max(Math.min(item.element.clientWidth, window.innerWidth) - 8, 64) + "px";
@@ -886,6 +887,7 @@ export const adjustLayout = (layout: Layout = window.siyuan.layout.centerLayout.
                 return true;
             }
         });
+        index--;
     }
     if (lastItem) {
         lastItem.style.maxWidth = Math.max(Math.min(lastItem.clientWidth, window.innerWidth) - 8, 64) + "px";