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

Shape tools: don't create undoable until finished 

Don't create undoables for shapes until end

- Quick Undo: Canceling a gesture, you can no longer redo to bring the canceled result back. I should fix this.
- The history view will no longer show these actions until the tool finishes. This is fine. In the future I could show in-progress actions formally.
- MultiTools: additional undoables are created. MultiTools are already inconsistent with how undoables are created tho.
- Multi-User mode: may be improved by this?
main
Isaiah Odhner 2019-12-10 14:34:49 -05:00
parent 5cdf23d3f7
commit 88d4074108
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/tools.js
View File

@ -579,7 +579,6 @@ window.tools = [{
help_icon: "p_line.gif",
description: "Draws a straight line with the selected line width.",
cursor: ["precise", [16, 16], "crosshair"],
undoableOnPointerDown: true,
stroke_only: true,
shape(ctx, x, y, w, h) {
update_brush_for_drawing_lines(stroke_size);
@ -671,7 +670,6 @@ window.tools = [{
help_icon: "p_rect.gif",
description: "Draws a rectangle with the selected fill style.",
cursor: ["precise", [16, 16], "crosshair"],
undoableOnPointerDown: true,
shape(ctx, x, y, w, h) {
if(w < 0){ x += w; w = -w; }
if(h < 0){ y += h; h = -h; }
@ -835,7 +833,6 @@ window.tools = [{
help_icon: "p_oval.gif",
description: "Draws an ellipse with the selected fill style.",
cursor: ["precise", [16, 16], "crosshair"],
undoableOnPointerDown: true,
shape(ctx, x, y, w, h) {
if(w < 0){ x += w; w = -w; }
if(h < 0){ y += h; h = -h; }
@ -862,7 +859,6 @@ window.tools = [{
help_icon: "p_rrect.gif",
description: "Draws a rounded rectangle with the selected fill style.",
cursor: ["precise", [16, 16], "crosshair"],
undoableOnPointerDown: true,
shape(ctx, x, y, w, h) {
if(w < 0){ x += w; w = -w; }
if(h < 0){ y += h; h = -h; }
@ -972,8 +968,10 @@ tools.forEach((tool)=> {
};
tool.pointerup = ()=> {
if(!tool.shape_canvas){ return; }
ctx.drawImage(tool.shape_canvas, 0, 0);
tool.shape_canvas = null;
undoable(tool.name, ()=> {
ctx.drawImage(tool.shape_canvas, 0, 0);
tool.shape_canvas = null;
}, get_icon_for_tool(tool));
};
tool.drawPreviewUnderGrid = (ctx, x, y, grid_visible, scale, translate_x, translate_y)=> {
if(!pointer_active){ return; }