Vanessa 2022-08-19 17:34:47 +08:00
parent a7d3e8a0c8
commit e91ae262ec

View File

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