mirror of
https://github.com/storytold/vectorcraft.git
synced 2026-11-19 17:05:55 +01:00
Layers: a path dragged from a Live Paint group's paths into the group keeps its faces' paint
Dragging one of a Live Paint group's own paths from its hidden sources into the group made the group's faces and edges again before adding the path back, so the merge read the paint from the rebuilt parts. With the path as the only source every face and edge was dropped; with others, the faces the path bounded lost their fill. The group the rows join is now made again by the merge alone, which carries the paint of the faces and edges as they were before the move.
This commit is contained in:
1 parent
f0d4abcdcc
commit
0aede64dbd
2 files changed
+29
-1
No files matched your search
@@ -382,7 +382,10 @@ impl LivePaintMove {
|
||||
if self.join.is_none() && self.rebuild.is_empty() {
|
||||
return Ok(moved.to_vec());
|
||||
}
|
||||
for g in &self.rebuild {
|
||||
// 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)?;
|
||||
}
|
||||
let Some((g, mask)) = self.join else { return Ok(moved.iter().copied().filter(|r| d.node(*r).is_some()).collect()) };
|
||||
|
||||
@@ -5245,6 +5245,31 @@ fn layers_drag_out_of_a_live_paint_group_makes_its_faces_again() {
|
||||
assert_eq!(faces(&node(&s, g)).len(), 1);
|
||||
}
|
||||
|
||||
/// A path dragged from a Live Paint group's sources into the group itself stays among its paths,
|
||||
/// and the faces it bounds keep their paint, also when it is the group's only path.
|
||||
#[test]
|
||||
fn layers_drag_a_source_path_into_its_own_live_paint_group_keeps_the_paint() {
|
||||
use vectorcraft_tools::builder::{face_at, faces, sources};
|
||||
let green = Paint::solid(Color::from_hex("#00ff00").unwrap());
|
||||
let blue = Paint::solid(Color::from_hex("#0000ff").unwrap());
|
||||
let mut s = session();
|
||||
let g = live(&mut s);
|
||||
let layer = s.doc().unwrap().doc.parent_of(g).unwrap();
|
||||
s.execute("livePaint.fill", &json!({"group": g.0, "point": [25, 50], "color": "#00ff00"})).unwrap();
|
||||
let src: Vec<NodeId> = sources(&node(&s, g)).unwrap().children().unwrap().iter().map(|c| c.id).collect();
|
||||
s.execute("layer.move", &json!({"ids": [src[0].0], "target": g.0, "place": "inside"})).unwrap();
|
||||
let n = node(&s, g);
|
||||
assert_eq!(s.doc().unwrap().doc.parent_of(src[0]), Some(sources(&n).unwrap().id), "the path stays among the group's paths");
|
||||
assert_eq!(faces(&n).len(), 3);
|
||||
assert_eq!(face_at(&n, Point::new(25.0, 50.0)).unwrap().appearance.fill_paint(), green, "the face it bounds keeps its fill");
|
||||
s.execute("layer.move", &json!({"ids": [src[1].0], "target": layer.0})).unwrap();
|
||||
s.execute("livePaint.fill", &json!({"group": g.0, "point": [50, 50], "color": "#0000ff"})).unwrap();
|
||||
s.execute("layer.move", &json!({"ids": [src[0].0], "target": g.0, "place": "inside"})).unwrap();
|
||||
let n = node(&s, g);
|
||||
assert_eq!(faces(&n).len(), 1);
|
||||
assert_eq!(face_at(&n, Point::new(50.0, 50.0)).unwrap().appearance.fill_paint(), blue, "the only path's face keeps its fill");
|
||||
}
|
||||
|
||||
/// 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