From 2fdcdc7f0c2af8bdb46117432edc97a843e81e78 Mon Sep 17 00:00:00 2001 From: Victor Seiji Hariki Date: Thu, 24 Nov 2022 12:17:29 -0300 Subject: [PATCH] remove usebordermask box Signed-off-by: Victor Seiji Hariki Former-commit-id: f194ab10ed3caa63d3e8468de035b70d414244bf --- js/ui/toolbar.js | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/js/ui/toolbar.js b/js/ui/toolbar.js index d188a29..3296afa 100644 --- a/js/ui/toolbar.js +++ b/js/ui/toolbar.js @@ -275,7 +275,6 @@ tools.img2img = toolbar.registerTool( state.snapToGrid = true; state.denoisingStrength = 0.7; - state.useBorderMask = true; state.borderMaskSize = 64; state.mousemovecb = (evn) => { @@ -294,7 +293,7 @@ tools.img2img = toolbar.registerTool( auxCanvas.height = bb.h; const auxCtx = auxCanvas.getContext("2d"); - if (state.useBorderMask) { + if (state.borderMaskSize > 0) { auxCtx.fillStyle = "#FF6A6A50"; auxCtx.fillRect(0, 0, state.borderMaskSize, bb.h); auxCtx.fillRect(0, 0, bb.w, state.borderMaskSize); @@ -358,14 +357,7 @@ tools.img2img = toolbar.registerTool( menu.appendChild(state.ctxmenu.snapToGridLabel); menu.appendChild(document.createElement("br")); menu.appendChild(state.ctxmenu.denoisingStrengthSlider); -<<<<<<< HEAD menu.appendChild(state.ctxmenu.borderMaskSlider); -======= - menu.appendChild(document.createElement("br")); - menu.appendChild(state.ctxmenu.useBorderMaskSlider); - menu.appendChild(document.createElement("br")); - menu.appendChild(state.ctxmenu.borderMaskSize); ->>>>>>> main }, shortcut: "I", }