Skip to content

Commit b0529b0

Browse files
committed
🐛 Fix sidebar width anomaly
fix #14856 02 03
1 parent 30a27d1 commit b0529b0

File tree

1 file changed

+15
-1
lines changed

1 file changed

+15
-1
lines changed

app/src/layout/util.ts

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -970,6 +970,12 @@ export const addResize = (obj: Layout | Wnd) => {
970970

971971
export const adjustLayout = (layout: Layout = window.siyuan.layout.centerLayout.parent) => {
972972
layout.children.forEach((item: Layout | Wnd) => {
973+
if (item.element.classList.contains("layout__center") ||
974+
item.element.classList.contains("layout__dockl") ||
975+
item.element.classList.contains("layout__dockr")) {
976+
return;
977+
}
978+
973979
item.element.style.maxWidth = "";
974980
if (!item.element.style.width && !item.element.classList.contains("layout__center")) {
975981
item.element.style.minWidth = "8px";
@@ -982,6 +988,12 @@ export const adjustLayout = (layout: Layout = window.siyuan.layout.centerLayout.
982988
// +2 由于某些分辨率下 scrollWidth 会大于 clientWidth
983989
while (layout.element.scrollWidth > layout.element.clientWidth + 2 && index > 0) {
984990
layout.children.find((item: Layout | Wnd) => {
991+
if (item.element.classList.contains("layout__center") ||
992+
item.element.classList.contains("layout__dockl") ||
993+
item.element.classList.contains("layout__dockr")) {
994+
return false;
995+
}
996+
985997
if (item.element.style.width && item.element.style.width !== "0px") {
986998
item.element.style.maxWidth = Math.max(Math.min(item.element.clientWidth, window.innerWidth) - 8, 64) + "px";
987999
lastItem = item.element;
@@ -992,7 +1004,9 @@ export const adjustLayout = (layout: Layout = window.siyuan.layout.centerLayout.
9921004
});
9931005
index--;
9941006
}
995-
if (lastItem) {
1007+
if (lastItem && !lastItem.classList.contains("layout__center") &&
1008+
!lastItem.classList.contains("layout__dockl") &&
1009+
!lastItem.classList.contains("layout__dockr")) {
9961010
lastItem.style.maxWidth = Math.max(Math.min(lastItem.clientWidth, window.innerWidth) - 8, 64) + "px";
9971011
}
9981012
layout.children.forEach((item: Layout | Wnd) => {

0 commit comments

Comments
 (0)