Skip to content

fix: incorrect segment order #532

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
ankushKun wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: incorrect segment order #532

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
23 changes: 21 additions & 2 deletions kurbo/src/stroke.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,6 +602,8 @@ enum DashState {
ToStash,
Working,
FromStash,
/// for open paths: output stash contents then work
OutputStashThenWork,
}

impl<T: Iterator<Item = PathEl>> Iterator for DashIterator<'_, T> {
Expand Down Expand Up @@ -648,6 +650,17 @@ impl<T: Iterator<Item = PathEl>> Iterator for DashIterator<'_, T> {
}
}
}
DashState::OutputStashThenWork => {
// output stashed content then continue working
if let Some(el) = self.stash.get(self.stash_ix) {
self.stash_ix += 1;
return Some(*el);
} else {
self.stash.clear();
self.stash_ix = 0;
self.state = DashState::Working;
}
}
}
}
}
Expand Down Expand Up @@ -790,7 +803,13 @@ impl<'a, T: Iterator<Item = PathEl>> DashIterator<'a, T> {
if self.is_active {
let subseg = seg.subsegment(0.0..t1);
result = Some(seg_to_el(&subseg));
self.state = DashState::Working;
// For open paths: output stash first, then continue working
// For closed paths: stay in ToStash until the path closes
if self.state == DashState::ToStash && !self.closepath_pending {
self.state = DashState::OutputStashThenWork;
} else {
self.state = DashState::Working;
}
} else {
let p = seg.eval(t1);
result = Some(PathEl::MoveTo(p));
Expand Down Expand Up @@ -925,10 +944,10 @@ mod tests {
let shape = Line::new((0.0, 0.0), (21.0, 0.0));
let dashes = [1., 5., 2., 5.];
let expansion = [
PathSeg::Line(Line::new((0., 0.), (1., 0.))),
PathSeg::Line(Line::new((6., 0.), (8., 0.))),
PathSeg::Line(Line::new((13., 0.), (14., 0.))),
PathSeg::Line(Line::new((19., 0.), (21., 0.))),
PathSeg::Line(Line::new((0., 0.), (1., 0.))),
];
let iter = segments(dash(shape.path_elements(0.), 0., &dashes));
assert_eq!(iter.collect::<Vec<PathSeg>>(), expansion);
Expand Down