wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-02-14 15:32:35 +08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

robust patch

Browse Source 
again...
This commit is contained in:
ltdrdata 2023-04-23 23:05:00 +09:00
parent 1a9c556890
commit a09406bff5
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
web/extensions/core/maskeditor.js
View File

@ -296,7 +296,7 @@ class MaskEditorDialog extends ComfyDialog {
const x = event.offsetX || event.targetTouches[0].clientX - maskRect.left; const x = event.offsetX || event.targetTouches[0].clientX - maskRect.left;
const y = event.offsetY || event.targetTouches[0].clientY - maskRect.top; const y = event.offsetY || event.targetTouches[0].clientY - maskRect.top;
if(diff > 20) if(diff > 20 && !this.drawing_mode)
requestAnimationFrame(() => { requestAnimationFrame(() => {
self.maskCtx.beginPath(); self.maskCtx.beginPath();
self.maskCtx.fillStyle = "rgb(0,0,0)"; self.maskCtx.fillStyle = "rgb(0,0,0)";
@ -333,11 +333,11 @@ class MaskEditorDialog extends ComfyDialog {
} }
else if(event.buttons === 2) { else if(event.buttons === 2) {
event.preventDefault(); event.preventDefault();
const maskRect = maskCanvas.getBoundingClientRect(); const maskRect = self.maskCanvas.getBoundingClientRect();
const x = event.offsetX || event.targetTouches[0].clientX - maskRect.left; const x = event.offsetX || event.targetTouches[0].clientX - maskRect.left;
const y = event.offsetY || event.targetTouches[0].clientY - maskRect.top; const y = event.offsetY || event.targetTouches[0].clientY - maskRect.top;
if(diff > 16 && !drawing_mode) // cannot tracking drawing_mode for touch event if(diff > 20 && !drawing_mode) // cannot tracking drawing_mode for touch event
requestAnimationFrame(() => { requestAnimationFrame(() => {
self.maskCtx.beginPath(); self.maskCtx.beginPath();
self.maskCtx.globalCompositeOperation = "destination-out"; self.maskCtx.globalCompositeOperation = "destination-out";
@ -373,9 +373,11 @@ class MaskEditorDialog extends ComfyDialog {
} }
handleMouseDown(self, event) { handleMouseDown(self, event) {
self.drawing_mode = true;
if (event.button == 0) { if (event.button == 0) {
const maskRect = maskCanvas.getBoundingClientRect(); self.drawing_mode = true;
event.preventDefault();
const maskRect = self.maskCanvas.getBoundingClientRect();
const x = event.offsetX || event.targetTouches[0].clientX - maskRect.left; const x = event.offsetX || event.targetTouches[0].clientX - maskRect.left;
const y = event.offsetY || event.targetTouches[0].clientY - maskRect.top; const y = event.offsetY || event.targetTouches[0].clientY - maskRect.top;
@ -389,7 +391,10 @@ class MaskEditorDialog extends ComfyDialog {
self.lasttime = performance.now(); self.lasttime = performance.now();
} }
else if(event.button == 2) { else if(event.button == 2) {
const maskRect = maskCanvas.getBoundingClientRect(); self.drawing_mode = true;
event.preventDefault();
const maskRect = self.maskCanvas.getBoundingClientRect();
const x = event.offsetX || event.targetTouches[0].clientX - maskRect.left; const x = event.offsetX || event.targetTouches[0].clientX - maskRect.left;
const y = event.offsetY || event.targetTouches[0].clientY - maskRect.top; const y = event.offsetY || event.targetTouches[0].clientY - maskRect.top;
@ -404,6 +409,7 @@ class MaskEditorDialog extends ComfyDialog {
} }
handleMouseUp(self, event) { handleMouseUp(self, event) {
event.preventDefault();
self.drawing_mode = false; self.drawing_mode = false;
} }