radex
/
jspaint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify fix

main
Isaiah Odhner 2019-12-02 12:05:48 -05:00
parent e53868e931
commit ea0429e3fa
2 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/functions.js
View File

@ -78,25 +78,25 @@ function update_helper_layer_immediately(e) {
hctx.clearRect(0, 0, hcanvas.width, hcanvas.height);
hctx.save();
selected_tools.forEach((selected_tool)=> {
if(selected_tool.drawPreviewUnderGrid && pointer){
hctx.save();
selected_tool.drawPreviewUnderGrid(hctx, pointer.x, pointer.y, grid_visible, scale, -viewport_x, -viewport_y);
hctx.restore();
}
});
hctx.restore();
if (grid_visible) {
draw_grid(hctx, scale);
}
hctx.save();
selected_tools.forEach((selected_tool)=> {
if(selected_tool.drawPreviewAboveGrid && pointer){
hctx.save();
selected_tool.drawPreviewAboveGrid(hctx, pointer.x, pointer.y, grid_visible, scale, -viewport_x, -viewport_y);
hctx.restore();
}
});
hctx.restore();
}
function update_disable_aa() {
const dots_per_canvas_px = window.devicePixelRatio * magnification;

20
src/tools.js
View File

@ -121,14 +121,10 @@ window.tools = [{
if(!pointer_active && !pointer_over_canvas){return;}
if(!this.preview_canvas){return;}
ctx.save();
ctx.scale(scale, scale);
ctx.translate(translate_x, translate_y);
ctx.drawImage(this.preview_canvas, 0, 0);
ctx.restore();
},
$options: $choose_transparent_mode
}, {
@ -172,15 +168,11 @@ window.tools = [{
const rect_w = eraser_size;
const rect_h = eraser_size;
ctx.save();
ctx.scale(scale, scale);
ctx.translate(translate_x, translate_y);
ctx.fillStyle = colors.background;
ctx.fillRect(rect_x, rect_y, rect_w, rect_h);
ctx.restore();
},
drawPreviewAboveGrid(ctx, x, y, grid_visible, scale, translate_x, translate_y) {
if(!pointer_active && !pointer_over_canvas){return;}
@ -190,8 +182,6 @@ window.tools = [{
const rect_w = eraser_size;
const rect_h = eraser_size;
ctx.save();
ctx.scale(scale, scale);
ctx.translate(translate_x, translate_y);
const hairline_width = 1/scale;
@ -203,8 +193,6 @@ window.tools = [{
} else {
ctx.strokeRect(rect_x+ctx.lineWidth/2, rect_y+ctx.lineWidth/2, rect_w-ctx.lineWidth, rect_h-ctx.lineWidth);
}
ctx.restore();
},
paint(ctx, x, y) {
@ -474,14 +462,10 @@ window.tools = [{
drawPreviewUnderGrid(ctx, x, y, grid_visible, scale, translate_x, translate_y) {
if(!pointer_active && !pointer_over_canvas){return;}
ctx.save();
ctx.scale(scale, scale);
ctx.translate(translate_x, translate_y);
this.paint(ctx, x, y);
ctx.restore();
},
$options: $choose_brush
}, {
@ -853,15 +837,11 @@ tools.forEach((tool)=> {
if(!pointer_active){ return; }
if(!pointer_has_moved) { return; }
ctx.save();
ctx.scale(scale, scale);
ctx.translate(translate_x, translate_y);
// make the document canvas part of the helper canvas so that inversion can apply to it
ctx.drawImage(canvas, 0, 0);
ctx.restore();
};
tool.drawPreviewAboveGrid = (ctx, x, y, grid_visible, scale, translate_x, translate_y)=> {
if(!pointer_active){ return; }