Skip to content

stroke: a pen lifted off the canvas still commits its stroke #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
foxnne wants to merge 1 commit into
base: main
Choose a base branch
from
Open

stroke: a pen lifted off the canvas still commits its stroke #70

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions src/internal/File.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2524,6 +2524,9 @@ pub fn drawPoint(file: *File, point: dvui.Point, layer: DrawLayer, draw_options:
defer active_layer.dirty = true;

if (point.x < 0 or point.x >= @as(f32, @floatFromInt(file.width())) or point.y < 0 or point.y >= @as(f32, @floatFromInt(file.height()))) {
// A pen lifted off the canvas still ends its stroke: the pixels drawn on the way in are
// in the buffer, and the next press would discard them with no undo step to take them back.
if (draw_options.to_change and layer == .selected and !draw_options.mask_only and file.strokeInProgress()) file.commitStroke(active_layer.id);
return;
}

Expand Down Expand Up @@ -2561,11 +2564,11 @@ pub fn drawLine(file: *File, point1: dvui.Point, point2: dvui.Point, layer: Draw

defer active_layer.dirty = true;

if (point1.x < 0 or point1.x >= @as(f32, @floatFromInt(file.width())) or point1.y < 0 or point1.y >= @as(f32, @floatFromInt(file.height()))) {
return;
}

if (point2.x < 0 or point2.x >= @as(f32, @floatFromInt(file.width())) or point2.y < 0 or point2.y >= @as(f32, @floatFromInt(file.height()))) {
const off_canvas = point1.x < 0 or point1.x >= @as(f32, @floatFromInt(file.width())) or point1.y < 0 or point1.y >= @as(f32, @floatFromInt(file.height())) or
point2.x < 0 or point2.x >= @as(f32, @floatFromInt(file.width())) or point2.y < 0 or point2.y >= @as(f32, @floatFromInt(file.height()));
if (off_canvas) {
// As in `drawPoint`: nothing to draw, but a stroke ending here still has to be committed.
if (draw_options.to_change and layer == .selected and !draw_options.mask_only and file.strokeInProgress()) file.commitStroke(active_layer.id);
return;
}

Expand Down Expand Up @@ -2632,6 +2635,11 @@ fn drawOffsets(file: *File, active_layer: *Layer, layer: DrawLayer, offsets: []c
}
}

/// A pen is down with something to commit: a snapshot waiting to be diffed, or pixels noted.
fn strokeInProgress(file: *const File) bool {
return file.editor.stroke_undo_deferred or file.buffers.stroke.pixels.count() > 0;
}

/// The stroke so far becomes one undo step.
fn commitStroke(file: *File, layer_id: u64) void {
if (file.editor.stroke_undo_deferred) {
Expand Down
Loading