0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🐛 https://github.com/siyuan-note/siyuan/issues/5675 3

Browse source
This commit is contained in:
Vanessa 2022-08-19 17:34:47 +08:00
parent a7d3e8a0c8
commit e91ae262ec
1 changed files with 29 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
app/src/protyle/toolbar/index.ts
View file

@ -715,6 +715,8 @@ export class Toolbar {
pingElement.classList.add("block__icon--active");
pingElement.setAttribute("aria-label", window.siyuan.languages.unpin);
}
event.preventDefault()
event.stopPropagation();
}
return;
}
@ -772,32 +774,34 @@ export class Toolbar {
dragBgElement.classList.remove("fn__none");
const x = event.clientX - parseInt(this.subElement.style.left);
const y = event.clientY - parseInt(this.subElement.style.top);
setTimeout(() => {
// windows 需等待 dragBgElement 显示后才可以进行 move https://github.com/siyuan-note/siyuan/issues/2950
documentSelf.onmousemove = (moveEvent: MouseEvent) => {
let positionX = moveEvent.clientX - x;
let positionY = moveEvent.clientY - y;
if (positionX > window.innerWidth - this.subElement.clientWidth) {
positionX = window.innerWidth - this.subElement.clientWidth;
}
if (positionY > window.innerHeight - this.subElement.clientHeight) {
positionY = window.innerHeight - this.subElement.clientHeight;
}
this.subElement.style.left = Math.max(positionX, 0) + "px";
this.subElement.style.top = Math.max(positionY, Constants.SIZE_TOOLBAR_HEIGHT) + "px";
this.subElement.firstElementChild.setAttribute("data-drag", "true");
};
// setTimeout(() => {
// windows 需等待 dragBgElement 显示后才可以进行 move https://github.com/siyuan-note/siyuan/issues/2950
documentSelf.onmousemove = (moveEvent: MouseEvent) => {
let positionX = moveEvent.clientX - x;
let positionY = moveEvent.clientY - y;
if (positionX > window.innerWidth - this.subElement.clientWidth) {
positionX = window.innerWidth - this.subElement.clientWidth;
}
if (positionY > window.innerHeight - this.subElement.clientHeight) {
positionY = window.innerHeight - this.subElement.clientHeight;
}
this.subElement.style.left = Math.max(positionX, 0) + "px";
this.subElement.style.top = Math.max(positionY, Constants.SIZE_TOOLBAR_HEIGHT) + "px";
this.subElement.firstElementChild.setAttribute("data-drag", "true");
};
// });
console.log("onmousedown");
documentSelf.onmouseup = () => {
console.log("onmouseup");
this.subElement.style.userSelect = "auto";
documentSelf.onmousemove = null;
documentSelf.onmouseup = null;
documentSelf.ondragstart = null;
documentSelf.onselectstart = null;
documentSelf.onselect = null;
dragBgElement.classList.add("fn__none");
};
documentSelf.onmouseup = () => {
this.subElement.style.userSelect = "auto";
documentSelf.onmousemove = null;
documentSelf.onmouseup = null;
documentSelf.ondragstart = null;
documentSelf.onselectstart = null;
documentSelf.onselect = null;
dragBgElement.classList.add("fn__none");
};
});
return;
});
const textElement = this.subElement.querySelector(".b3-text-field") as HTMLTextAreaElement;