Skip to content

Improve UI layout #15011

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
+22 −1
Closed

Improve UI layout #15011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30a27d1
:bug: No longer show the scrollbar at the bottom of the interface
TCOTC Jun 11, 2025
f7e49bf
:bug: Fix sidebar width anomaly
TCOTC Jun 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions app/src/layout/dock/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,16 @@ export class Dock {

if (activeElements.length === 0) {
this.resizeElement.classList.add("fn__none");
// 如果没有打开的侧栏，隐藏 layout 的子元素
this.layout.children.forEach(child => {
(child as Wnd).element.classList.add("fn__none");
});
if (this.layout.children.length > 1) {
const separatorElement = (this.layout.children[0] as Wnd).element.nextElementSibling;
if (separatorElement) {
separatorElement.classList.add("fn__none");
}
}
} else {
activeElements.forEach(item => {
this.toggleModel(item.getAttribute("data-type") as TDock, true, false, false, false);
Expand Down
13 changes: 12 additions & 1 deletion app/src/layout/util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -970,6 +970,11 @@ export const addResize = (obj: Layout | Wnd) => {

export const adjustLayout = (layout: Layout = window.siyuan.layout.centerLayout.parent) => {
layout.children.forEach((item: Layout | Wnd) => {
if (item.element.classList.contains("layout__dockl") ||
item.element.classList.contains("layout__dockr")) {
return;
}

item.element.style.maxWidth = "";
if (!item.element.style.width && !item.element.classList.contains("layout__center")) {
item.element.style.minWidth = "8px";
Expand All @@ -982,6 +987,11 @@ export const adjustLayout = (layout: Layout = window.siyuan.layout.centerLayout.
// +2 由于某些分辨率下 scrollWidth 会大于 clientWidth
while (layout.element.scrollWidth > layout.element.clientWidth + 2 && index > 0) {
layout.children.find((item: Layout | Wnd) => {
if (item.element.classList.contains("layout__dockl") ||
item.element.classList.contains("layout__dockr")) {
return false;
}

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";
lastItem = item.element;
Expand All @@ -992,7 +1002,8 @@ export const adjustLayout = (layout: Layout = window.siyuan.layout.centerLayout.
});
index--;
}
if (lastItem) {
if (lastItem && !lastItem.classList.contains("layout__dockl") &&
!lastItem.classList.contains("layout__dockr")) {
lastItem.style.maxWidth = Math.max(Math.min(lastItem.clientWidth, window.innerWidth) - 8, 64) + "px";
}
layout.children.forEach((item: Layout | Wnd) => {
Expand Down