Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-03-10 22:52:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 https://github.com/siyuan-note/siyuan/issues/3499

Browse source
This commit is contained in:
Vanessa 2023-02-11 21:21:13 +08:00
parent b2a85c66c6
commit e3d329cee8
7 changed files with 100 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

31
app/src/util/globalShortcut.ts
View file

@ -98,11 +98,10 @@ export const globalShortcut = () => {
if (event.clientX < 43) {
if (!window.siyuan.layout.leftDock.pin) {
if (event.clientY > 32 &&
(window.siyuan.config.appearance.hideStatusBar ||
(!window.siyuan.config.appearance.hideStatusBar && event.clientY < window.innerHeight - 32))
) {
if (event.clientY > document.getElementById("toolbar").clientHeight + document.getElementById("dockTop").clientHeight &&
event.clientY < window.innerHeight - document.getElementById("status").clientHeight - document.getElementById("dockBottom").clientHeight) {
if (!hasClosestByClassName(event.target as HTMLElement, "b3-menu") &&
!hasClosestByClassName(event.target as HTMLElement, "layout--float") &&
window.siyuan.layout.leftDock.layout.element.style.opacity !== "1") {
window.siyuan.layout.leftDock.layout.element.style.left = (window.siyuan.layout.leftDock.element.clientWidth + .5) + "px"
window.siyuan.layout.leftDock.layout.element.style.opacity = "1"
@ -111,6 +110,30 @@ export const globalShortcut = () => {
window.siyuan.layout.leftDock.hideDock();
}
}
} else if (event.clientX > window.innerWidth - 41) {
if (!window.siyuan.layout.rightDock.pin) {
if (event.clientY > document.getElementById("toolbar").clientHeight + document.getElementById("dockTop").clientHeight &&
event.clientY < window.innerHeight - document.getElementById("status").clientHeight - document.getElementById("dockBottom").clientHeight) {
if (!hasClosestByClassName(event.target as HTMLElement, "layout--float") && window.siyuan.layout.rightDock.layout.element.style.opacity !== "1") {
window.siyuan.layout.rightDock.layout.element.style.right = (window.siyuan.layout.rightDock.element.clientWidth + .5) + "px"
window.siyuan.layout.rightDock.layout.element.style.opacity = "1"
}
} else {
window.siyuan.layout.rightDock.hideDock();
}
}
}
if (event.clientY < 75) {
if (!window.siyuan.layout.topDock.pin && window.siyuan.layout.topDock.layout.element.style.opacity !== "1") {
window.siyuan.layout.topDock.layout.element.style.top = (document.getElementById("dockTop").clientHeight + document.getElementById("toolbar").clientHeight + 1) + "px"
window.siyuan.layout.topDock.layout.element.style.opacity = "1"
}
} else if (event.clientY > window.innerHeight - 73) {
if (!window.siyuan.layout.bottomDock.pin && window.siyuan.layout.bottomDock.layout.element.style.opacity !== "1") {
window.siyuan.layout.bottomDock.layout.element.style.bottom = (document.getElementById("dockBottom").clientHeight + document.getElementById("status").clientHeight + 1) + "px"
window.siyuan.layout.bottomDock.layout.element.style.opacity = "1"
}
}
const eventPath0 = event.composedPath()[0] as HTMLElement;