Vanessa 2024-02-04 18:44:20 +08:00
parent 5f3b95d080
commit 16bd24f22d

View file

@ -48,7 +48,7 @@ export const windowMouseMove = (event: MouseEvent & { target: HTMLElement }, mou
event.buttons === 0 && // 鼠标按键被按下时不触发
window.siyuan.layout.bottomDock &&
!isWindow()) {
if (event.clientX < 43) {
if (event.clientX < document.getElementById("dockLeft").clientWidth + 1) {
if (!window.siyuan.layout.leftDock.pin && window.siyuan.layout.leftDock.layout.element.clientWidth > 0 &&
// 隐藏停靠栏会导致点击两侧内容触发浮动面板弹出,因此需减小鼠标范围
(window.siyuan.layout.leftDock.element.clientWidth > 0 || (window.siyuan.layout.leftDock.element.clientWidth === 0 && event.clientX < 8))) {
@ -62,7 +62,7 @@ export const windowMouseMove = (event: MouseEvent & { target: HTMLElement }, mou
window.siyuan.layout.leftDock.hideDock();
}
}
} else if (event.clientX > window.innerWidth - 41) {
} else if (event.clientX > window.innerWidth - document.getElementById("dockRight").clientWidth - 2) {
if (!window.siyuan.layout.rightDock.pin && window.siyuan.layout.rightDock.layout.element.clientWidth > 0 &&
(window.siyuan.layout.rightDock.element.clientWidth > 0 || (window.siyuan.layout.rightDock.element.clientWidth === 0 && event.clientX > window.innerWidth - 8))) {
if (event.clientY > document.getElementById("toolbar").clientHeight &&
@ -75,7 +75,7 @@ export const windowMouseMove = (event: MouseEvent & { target: HTMLElement }, mou
}
}
}
if (event.clientY > Math.min(window.innerHeight - 10, window.innerHeight - (window.siyuan.config.uiLayout.hideDock ? 0 : 42) - document.querySelector("#status").clientHeight)) {
if (event.clientY > Math.min(window.innerHeight - 10, window.innerHeight - (window.siyuan.config.uiLayout.hideDock ? 0 : document.getElementById("dockBottom").clientHeight) - document.querySelector("#status").clientHeight)) {
window.siyuan.layout.bottomDock.showDock();
}
}