sneedgroup-holder/openOutpaint
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix some tools

Browse source 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
This commit is contained in:
Victor Seiji Hariki 2022-12-17 00:55:53 -03:00
parent 701e1573bc
commit 2ee01e71c9
4 changed files with 12 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
js/ui/floating/layers.js
View file

@ -298,23 +298,13 @@ const uil = {
canvas.width = bb.w; canvas.width = bb.w;
canvas.height = bb.h; canvas.height = bb.h;
if (options.includeBg) if (options.includeBg)
ctx.drawImage( ctx.drawImage(bgLayer.canvas, bb.x, bb.y, bb.w, bb.h, 0, 0, bb.w, bb.h);
bgLayer.canvas,
bb.x + bgLayer.origin.x,
bb.y + bgLayer.origin.y,
bb.w,
bb.h,
0,
0,
bb.w,
bb.h
);
this.layers.forEach((layer) => { this.layers.forEach((layer) => {
if (!layer.hidden) if (!layer.hidden)
ctx.drawImage( ctx.drawImage(
layer.layer.canvas, layer.layer.canvas,
bb.x + layer.layer.origin.x, bb.x,
bb.y + layer.layer.origin.y, bb.y,
bb.w, bb.w,
bb.h, bb.h,
0, 0,

5
js/ui/tool/dream.js
View file

@ -44,7 +44,7 @@ const _monitorProgress = (bb, oncheck = null) => {
layer.ctx.fillRect(1, 1, bb.w * data.progress, 10); layer.ctx.fillRect(1, 1, bb.w * data.progress, 10);
// Draw Progress Text // Draw Progress Text
layer.ctx.clearRect(0, 11, expanded.w, 40); layer.clear();
layer.ctx.fillStyle = "#FFF"; layer.ctx.fillStyle = "#FFF";
layer.ctx.fillRect(0, 15, 60, 25); layer.ctx.fillRect(0, 15, 60, 25);
@ -295,8 +295,7 @@ const _generate = async (endpoint, request, bb, options = {}) => {
}); });
const redraw = (url = images[at]) => { const redraw = (url = images[at]) => {
if (url === null) if (url === null) layer.clear();
layer.ctx.clearRect(0, 0, layer.canvas.width, layer.canvas.height);
if (!url) return; if (!url) return;
const img = new Image(); const img = new Image();

9
js/ui/tool/interrogate.js
View file

@ -4,10 +4,8 @@ const interrogateTool = () =>
"Interrogate", "Interrogate",
(state, opt) => { (state, opt) => {
// Draw new cursor immediately // Draw new cursor immediately
ovCtx.clearRect(0, 0, ovCanvas.width, ovCanvas.height); ovLayer.clear();
state.mousemovecb({ state.redraw();
...mouse.coords.world.pos,
});
// Start Listeners // Start Listeners
mouse.listen.world.onmousemove.on(state.mousemovecb); mouse.listen.world.onmousemove.on(state.mousemovecb);
@ -37,8 +35,7 @@ const interrogateTool = () =>
state.invertMask = false; state.invertMask = false;
state.overMaskPx = 0; state.overMaskPx = 0;
state.erasePrevReticle = () => state.erasePrevReticle = () => ovLayer.clear();
ovCtx.clearRect(0, 0, ovCanvas.width, ovCanvas.height);
state.mousemovecb = (evn) => { state.mousemovecb = (evn) => {
state.erasePrevReticle(); state.erasePrevReticle();

8
js/ui/tool/select.js
View file

@ -4,7 +4,7 @@ const selectTransformTool = () =>
"Select Image", "Select Image",
(state, opt) => { (state, opt) => {
// Draw new cursor immediately // Draw new cursor immediately
ovCtx.clearRect(0, 0, ovCanvas.width, ovCanvas.height); ovLayer.clear();
state.movecb(mouse.coords.world.pos); state.movecb(mouse.coords.world.pos);
// Canvas left mouse handlers // Canvas left mouse handlers
@ -46,7 +46,7 @@ const selectTransformTool = () =>
state.reset(); state.reset();
// Resets cursor // Resets cursor
ovCtx.clearRect(0, 0, ovCanvas.width, ovCanvas.height); ovLayer.clear();
// Clears overlay // Clears overlay
imageCollection.inputElement.style.cursor = "auto"; imageCollection.inputElement.style.cursor = "auto";
@ -80,7 +80,7 @@ const selectTransformTool = () =>
state.lastMouseMove = null; state.lastMouseMove = null;
state.redraw = () => { state.redraw = () => {
ovCtx.clearRect(0, 0, ovCanvas.width, ovCanvas.height); ovLayer.clear();
state.movecb(state.lastMouseMove); state.movecb(state.lastMouseMove);
}; };
@ -186,7 +186,7 @@ const selectTransformTool = () =>
// Mouse move handler. As always, also renders cursor // Mouse move handler. As always, also renders cursor
state.movecb = (evn) => { state.movecb = (evn) => {
ovCtx.clearRect(0, 0, ovCanvas.width, ovCanvas.height); ovLayer.clear();
uiCtx.clearRect(0, 0, uiCanvas.width, uiCanvas.height); uiCtx.clearRect(0, 0, uiCanvas.width, uiCanvas.height);
imageCollection.inputElement.style.cursor = "auto"; imageCollection.inputElement.style.cursor = "auto";
state.lastMouseTarget = evn.target; state.lastMouseTarget = evn.target;