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

Hide tool previews when appropriate

main
Isaiah Odhner 2019-10-01 18:45:32 -04:00
parent efec7f62bb
commit 39482d3fe9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app.js
View File

@ -552,10 +552,6 @@ $canvas.on("pointerleave", function(e){
$status_position.text("");
if (!pointer_active) {
pointer.x = -100;
pointer.y = -100;
}
update_helper_layer();
if (!pointer_active && update_helper_layer_on_pointermove_active) {

4
src/tools.js
View File

@ -117,6 +117,7 @@ tools = [{
this.preview_canvas.height = 1;
},
drawPreviewUnderGrid: function(ctx, x, y, scaled_by_amount, grid_visible) {
if(!pointer_active && !pointer_over_canvas){return;}
if(!this.preview_canvas){return;}
ctx.drawImage(this.preview_canvas, 0, 0);
},
@ -184,6 +185,7 @@ tools = [{
cursor: ["precise", [16, 16], "crosshair"],
continuous: "space",
drawPreviewUnderGrid: function(ctx, x, y, scaled_by_amount, grid_visible) {
if(!pointer_active && !pointer_over_canvas){return;}
var rect_x = ~~(x - eraser_size/2);
var rect_y = ~~(y - eraser_size/2);
var rect_w = eraser_size;
@ -193,6 +195,7 @@ tools = [{
ctx.fillRect(rect_x, rect_y, rect_w, rect_h);
},
drawPreviewAboveGrid: function(ctx, x, y, scaled_by_amount, grid_visible) {
if(!pointer_active && !pointer_over_canvas){return;}
var hairline_width = 1/scaled_by_amount;
var rect_x = ~~(x - eraser_size/2);
@ -382,6 +385,7 @@ tools = [{
ctx.drawImage(brush_canvas, Math.ceil(x-csz/2), Math.ceil(y-csz/2));
},
drawPreviewUnderGrid: function(ctx, x, y, scaled_by_amount, grid_visible) {
if(!pointer_active && !pointer_over_canvas){return;}
this.paint(ctx, x, y);
},
$options: $choose_brush