From 22b64a0dc4110b8061b851eb90686b25f6d83994 Mon Sep 17 00:00:00 2001
From: SiriusXT <1160925501@qq.com>
Date: Sun, 18 May 2025 16:24:13 +0800
Subject: [PATCH] fix(ui): Exclude launcher pane width from Split calculation;
 Record Split state for multiple windows

---
 apps/client/src/services/resizer.ts | 30 +++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/apps/client/src/services/resizer.ts b/apps/client/src/services/resizer.ts
index 1cce0f993..4b80db7ba 100644
--- a/apps/client/src/services/resizer.ts
+++ b/apps/client/src/services/resizer.ts
@@ -3,7 +3,11 @@ import Split from "split.js"
 
 export const DEFAULT_GUTTER_SIZE = 5;
 
+let leftPaneWidth: number;
+let reservedPx: number;
+let layoutOrientation: string;
 let leftInstance: ReturnType<typeof Split> | null;
+let rightPaneWidth: number;
 let rightInstance: ReturnType<typeof Split> | null;
 
 function setupLeftPaneResizer(leftPaneVisible: boolean) {
@@ -14,27 +18,34 @@ function setupLeftPaneResizer(leftPaneVisible: boolean) {
 
     $("#left-pane").toggle(leftPaneVisible);
 
+    layoutOrientation = layoutOrientation ?? options.get("layoutOrientation");
+    reservedPx = reservedPx ?? (layoutOrientation === "vertical" ? ($("#launcher-pane").outerWidth() || 0) : 0);
+    // Window resizing causes `window.innerWidth` to change, so `reservedWidth` needs to be recalculated each time.
+    const reservedWidth = reservedPx / window.innerWidth * 100;
     if (!leftPaneVisible) {
-        $("#rest-pane").css("width", "100%");
-
+        $("#rest-pane").css("width", layoutOrientation === "vertical" ? `calc(100% - ${reservedWidth})` : "100%");
         return;
     }
 
-    let leftPaneWidth = options.getInt("leftPaneWidth");
+    leftPaneWidth = leftPaneWidth ?? (options.getInt("leftPaneWidth") ?? 0);
     if (!leftPaneWidth || leftPaneWidth < 5) {
         leftPaneWidth = 5;
     }
 
+    const restPaneWidth = 100 - leftPaneWidth - reservedWidth;
     if (leftPaneVisible) {
         // Delayed initialization ensures that all DOM elements are fully rendered and part of the layout,
         // preventing Split.js from retrieving incorrect dimensions due to #left-pane not being rendered yet,
         // which would cause the minSize setting to have no effect.
         requestAnimationFrame(() => {
             leftInstance = Split(["#left-pane", "#rest-pane"], {
-                sizes: [leftPaneWidth, 100 - leftPaneWidth],
+                sizes: [leftPaneWidth, restPaneWidth],
                 gutterSize: DEFAULT_GUTTER_SIZE,
                 minSize: [150, 300],
-                onDragEnd: (sizes) => options.save("leftPaneWidth", Math.round(sizes[0]))
+                onDragEnd: (sizes) => {
+                    leftPaneWidth = Math.round(sizes[0]);
+                    options.save("leftPaneWidth", Math.round(sizes[0]));
+                }
             });
         });
     }
@@ -54,7 +65,7 @@ function setupRightPaneResizer() {
         return;
     }
 
-    let rightPaneWidth = options.getInt("rightPaneWidth");
+    rightPaneWidth = rightPaneWidth ?? (options.getInt("rightPaneWidth") ?? 0);
     if (!rightPaneWidth || rightPaneWidth < 5) {
         rightPaneWidth = 5;
     }
@@ -63,8 +74,11 @@ function setupRightPaneResizer() {
         rightInstance = Split(["#center-pane", "#right-pane"], {
             sizes: [100 - rightPaneWidth, rightPaneWidth],
             gutterSize: DEFAULT_GUTTER_SIZE,
-            minSize: [ 300, 180 ],
-            onDragEnd: (sizes) => options.save("rightPaneWidth", Math.round(sizes[1]))
+            minSize: [300, 180],
+            onDragEnd: (sizes) => {
+                rightPaneWidth = Math.round(sizes[1]);
+                options.save("rightPaneWidth", Math.round(sizes[1]));
+            }
         });
     }
 }