Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-23 18:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🚨

Browse source
This commit is contained in:
Vanessa 2023-02-12 11:37:29 +08:00
parent 15de73d74a
commit ffb959db6e
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/src/layout/dock/index.ts
View file

@ -105,7 +105,7 @@ ${this.position === "Top" ? ("top:" + (.5 + this.element.clientHeight + document
this.resizeElement.classList.add("fn__none"); this.resizeElement.classList.add("fn__none");
} else { } else {
target.setAttribute("aria-label", window.siyuan.languages.unpin); target.setAttribute("aria-label", window.siyuan.languages.unpin);
this.layout.element.style.opacity = "" this.layout.element.style.opacity = "";
if (hasActive) { if (hasActive) {
this.resizeElement.classList.remove("fn__none"); this.resizeElement.classList.remove("fn__none");
} }
@ -168,12 +168,10 @@ ${this.position === "Top" ? "top" : "bottom"}:-${this.layout.element.clientHeigh
this.layout.element.clientWidth === 0 && this.layout.element.style.width.startsWith("0")) { this.layout.element.clientWidth === 0 && this.layout.element.style.width.startsWith("0")) {
return; return;
} }
console.log(2, this.layout.element.clientHeight, this.layout.element.style.height)
if ((this.position === "Top" || this.position === "Bottom") && if ((this.position === "Top" || this.position === "Bottom") &&
this.layout.element.clientHeight === 0 && this.layout.element.style.height.startsWith("0")) { this.layout.element.clientHeight === 0 && this.layout.element.style.height.startsWith("0")) {
return; return;
} }
console.log(3)
this.layout.element.style.opacity = "1"; this.layout.element.style.opacity = "1";
if (this.position === "Left") { if (this.position === "Left") {
window.siyuan.layout.leftDock.layout.element.style.left = (window.siyuan.layout.leftDock.element.clientWidth + .5) + "px"; window.siyuan.layout.leftDock.layout.element.style.left = (window.siyuan.layout.leftDock.element.clientWidth + .5) + "px";
@ -225,7 +223,7 @@ ${this.position === "Top" ? "top" : "bottom"}:-${this.layout.element.clientHeigh
} }
}); });
if (needFocus) { if (needFocus) {
this.showDock() this.showDock();
return; return;
} }
} }
@ -356,13 +354,12 @@ ${this.position === "Top" ? "top" : "bottom"}:-${this.layout.element.clientHeigh
} else { } else {
this.layout.element.style.height = this.getMaxSize() + "px"; this.layout.element.style.height = this.getMaxSize() + "px";
} }
console.log(this.layout.element.style.height, this.layout.element.clientHeight)
if ((type === "graph" || type === "globalGraph") && if ((type === "graph" || type === "globalGraph") &&
document.querySelector("body").classList.contains("body--win32") && this.layout.element.querySelector(".fullscreen")) { document.querySelector("body").classList.contains("body--win32") && this.layout.element.querySelector(".fullscreen")) {
document.getElementById("drag").classList.add("fn__hidden"); document.getElementById("drag").classList.add("fn__hidden");
} }
if (this.pin) { if (this.pin) {
this.layout.element.style.opacity = "" this.layout.element.style.opacity = "";
this.resizeElement.classList.remove("fn__none"); this.resizeElement.classList.remove("fn__none");
} }
} }

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

@ -124,7 +124,7 @@ export const globalShortcut = () => {
if (event.clientY < 75) { if (event.clientY < 75) {
window.siyuan.layout.topDock.showDock(); window.siyuan.layout.topDock.showDock();
} else if (event.clientY > window.innerHeight - 73) { } else if (event.clientY > window.innerHeight - 73) {
window.siyuan.layout.bottomDock.showDock() window.siyuan.layout.bottomDock.showDock();
} }
const eventPath0 = event.composedPath()[0] as HTMLElement; const eventPath0 = event.composedPath()[0] as HTMLElement;