mirror of
https://github.com/storytold/vectorcraft.git
synced 2026-11-19 09:13:34 +00:00
Layers: a drag into or out of a nested Live Paint group's paths remakes the groups that hold it
A Live Paint group among another group's paths gives that group its faces and edges. A row moved into or out of the inner group's paths now also makes the faces and edges of every Live Paint group that holds it among its paths again, innermost first, so the outer group no longer keeps faces and edges from the paths as they were.
This commit is contained in:
@@ -331,12 +331,27 @@ fn spot_in(d: &Document, parent: Option<NodeId>) -> Spot {
|
||||
Spot::Outside
|
||||
}
|
||||
|
||||
/// The Live Paint groups that hold Live Paint group `g` among their paths (in their sources group,
|
||||
/// at any depth), innermost first.
|
||||
fn enclosing_live_paints(d: &Document, g: NodeId) -> Vec<NodeId> {
|
||||
let mut out = vec![];
|
||||
let mut at = g;
|
||||
while let Spot::Source(o) = spot_in(d, d.parent_of(at)) {
|
||||
if out.contains(&o) {
|
||||
break;
|
||||
}
|
||||
out.push(o);
|
||||
at = o;
|
||||
}
|
||||
out
|
||||
}
|
||||
|
||||
/// What moving rows in the Layers panel (`layer.move`, `node.move`) does to Live Paint groups.
|
||||
/// Rows that go into a Live Paint group from elsewhere are added to it as `livePaint.merge` adds
|
||||
/// paths. Rows that go into or leave a group's paths (its sources group) change those paths, and
|
||||
/// the group's faces and edges are made again from them, keeping the paint of the faces and edges
|
||||
/// that stay. Rows moved within one group's paths, or among a group's own children, change no
|
||||
/// faces.
|
||||
/// that stay, and so are those of every Live Paint group that holds a changed group among its
|
||||
/// paths. Rows moved within one group's paths, or among a group's own children, change no faces.
|
||||
pub(crate) struct LivePaintMove {
|
||||
/// The Live Paint group the rows go into, and for each row whether it joins the group's paths.
|
||||
join: Option<(NodeId, Vec<bool>)>,
|
||||
@@ -411,13 +426,30 @@ impl LivePaintMove {
|
||||
// The group the rows join is made again by the merge below, from its paths as they are now
|
||||
// and with the paint of its faces and edges as they were before the move.
|
||||
let join_group = self.join.as_ref().map(|(g, _)| *g);
|
||||
for g in self.rebuild.iter().filter(|g| Some(**g) != join_group) {
|
||||
rebuild_paths(d, *g)?;
|
||||
// A Live Paint group among another group's paths gives that group its faces and edges, so
|
||||
// the groups holding a changed group among their paths are made again too, innermost first.
|
||||
let mut groups: Vec<NodeId> = vec![];
|
||||
for g in self.rebuild.iter().copied().chain(join_group) {
|
||||
for x in std::iter::once(g).chain(enclosing_live_paints(d, g)) {
|
||||
if !groups.contains(&x) {
|
||||
groups.push(x);
|
||||
}
|
||||
}
|
||||
}
|
||||
groups.sort_by_cached_key(|g| std::cmp::Reverse(d.ancestry(*g).map_or(0, |a| a.len())));
|
||||
let joined: Vec<NodeId> = match &self.join {
|
||||
Some((_, mask)) => moved.iter().zip(mask).filter(|(_, j)| **j).map(|(r, _)| *r).collect(),
|
||||
None => vec![],
|
||||
};
|
||||
for g in groups {
|
||||
if Some(g) == join_group {
|
||||
let roots: Vec<NodeId> = std::iter::once(g).chain(joined.iter().copied()).collect();
|
||||
merge_live(d, sel, &roots)?;
|
||||
} else if d.node(g).is_some() {
|
||||
rebuild_paths(d, g)?;
|
||||
}
|
||||
}
|
||||
let Some((g, mask)) = self.join else { return Ok(moved.iter().copied().filter(|r| d.node(*r).is_some()).collect()) };
|
||||
let joined = moved.iter().zip(&mask).filter(|(_, j)| **j).map(|(r, _)| *r);
|
||||
let roots: Vec<NodeId> = std::iter::once(g).chain(joined).collect();
|
||||
merge_live(d, sel, &roots)?;
|
||||
// `moved` holds each row once, so only the group can come twice. Faces and edges of the
|
||||
// group moved along with the joining rows were made again, so they are left out.
|
||||
let mut out = vec![];
|
||||
|
||||
@@ -5377,6 +5377,40 @@ fn layers_drag_a_source_path_into_its_own_live_paint_group_keeps_the_paint() {
|
||||
assert_eq!(face_at(&n, Point::new(50.0, 50.0)).unwrap().appearance.fill_paint(), blue, "the only path's face keeps its fill");
|
||||
}
|
||||
|
||||
/// A Live Paint group among another Live Paint group's paths gives it faces and edges: a path
|
||||
/// dragged into or out of the inner group's paths, or from the outer group's paths into the inner
|
||||
/// group's, makes the inner group's faces and edges again and then the outer group's.
|
||||
#[test]
|
||||
fn layers_drag_into_a_nested_live_paint_group_makes_the_outer_group_again() {
|
||||
use vectorcraft_tools::builder::{faces, sources};
|
||||
let mut s = session();
|
||||
let outer = live(&mut s);
|
||||
let inner = live(&mut s);
|
||||
let layer = s.doc().unwrap().doc.parent_of(outer).unwrap();
|
||||
let first_source = |s: &Session, g: NodeId| sources(&node(s, g)).unwrap().children().unwrap()[0].id;
|
||||
let into = |s: &mut Session, row: NodeId, g: NodeId| {
|
||||
let target = first_source(s, g);
|
||||
s.execute("layer.move", &json!({"ids": [row.0], "target": target.0, "place": "above"})).unwrap();
|
||||
};
|
||||
into(&mut s, inner, outer);
|
||||
assert_eq!(s.doc().unwrap().doc.parent_of(inner), Some(sources(&node(&s, outer)).unwrap().id));
|
||||
let plain = faces(&node(&s, outer)).len();
|
||||
let a = line_to_right_face(&mut s, 30.0);
|
||||
into(&mut s, a, inner);
|
||||
assert_eq!(faces(&node(&s, inner)).len(), 5);
|
||||
let cut = faces(&node(&s, outer)).len();
|
||||
assert!(cut > plain, "a path joining the inner group cuts the outer group's faces: {cut} faces, {plain} before");
|
||||
s.execute("layer.move", &json!({"ids": [a.0], "target": layer.0})).unwrap();
|
||||
assert_eq!(faces(&node(&s, inner)).len(), 3);
|
||||
assert_eq!(faces(&node(&s, outer)).len(), plain, "a path leaving the inner group leaves the outer group's faces");
|
||||
into(&mut s, a, outer);
|
||||
assert_eq!(faces(&node(&s, outer)).len(), cut);
|
||||
into(&mut s, a, inner);
|
||||
assert_eq!(s.doc().unwrap().doc.parent_of(a), Some(sources(&node(&s, inner)).unwrap().id));
|
||||
assert_eq!(faces(&node(&s, inner)).len(), 5);
|
||||
assert_eq!(faces(&node(&s, outer)).len(), cut, "the outer group is made after the inner one");
|
||||
}
|
||||
|
||||
/// Give Live Paint group `g` a lock, hidden state, appearance, knockout, opacity mask and
|
||||
/// graphic style link, and return it as it then is.
|
||||
fn dress_live_group(s: &mut Session, g: NodeId) -> Node {
|
||||
|
||||
Reference in New Issue
Block a user