Skip to content

Fix Spline tool in-progress drawing being cleared on tool change #2804

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

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

Fix Spline tool in-progress drawing being cleared on tool change #2804

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
20b7417
Issue found!
LixiviaDev Jun 29, 2025
db370e6
Merge branch 'GraphiteEditor:master' into fix-spline-cleared-on-tool-…
LixiviaDev Jun 30, 2025
1c24ad0
Spline tool no longer cleared on tool change
LixiviaDev Jun 30, 2025
45f01ae
delete splines with <2 points
0HyperCube Jul 5, 2025
12853c0
Merge branch 'master' into fix-spline-cleared-on-tool-change
Keavon Jul 5, 2025
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
9 changes: 8 additions & 1 deletion editor/src/messages/tool/tool_messages/spline_tool.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,14 @@ impl Fsm for SplineToolFsmState {
SplineToolFsmState::MergingEndpoints
}
(SplineToolFsmState::Drawing, SplineToolMessage::Abort) => {
responses.add(DocumentMessage::AbortTransaction);
if tool_data.points.len() < 2 {
// Delete layer if it is only a single point
responses.add(DocumentMessage::AbortTransaction);
} else {
// Delete the preview of the next stroke but commit the path
delete_preview(tool_data, responses);
responses.add(DocumentMessage::EndTransaction);
}
SplineToolFsmState::Ready
}
(_, SplineToolMessage::WorkingColorChanged) => {
Expand Down
Loading