mirror of
https://github.com/storytold/vectorcraft.git
synced 2026-11-19 06:38:44 +00:00
Layers: a path dragged into a Live Paint group keeps the group's identity and paint
A dropped path named "Live Paint Sources" that lands in front of the group's sources group made the group stop counting as a Live Paint group, so the drop failed. The group's own sources group now goes back in front before the paths are added. A dropped path named "Face" or "Edge" was read as one of the group's faces or edges and its paint overwrote the generated part's paint. The joining paths are now left out of the old parts.
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
use super::{
|
||||
Appearance, AppearanceItem, Arc, Beside, Document, EDGE_NAME, EngineError, FACE_NAME, GapOptions, GapSize, LIVE_PAINT_NAME, Node, NodeId,
|
||||
PathData, Point, Rect, Result, Selection, Session, SubPath, Value, b, bad, build_children, edge_near, face_at, finite, fit_to_old_edge, ids_json,
|
||||
is_live_paint, json, number_or, object_param, paint_from, po, point_param, repaint_from, replace_roots, root_ids, source_nodes, source_shapes,
|
||||
switch_or,
|
||||
PathData, Point, Rect, Result, SOURCES_NAME, Selection, Session, SubPath, Value, b, bad, build_children, edge_near, face_at, finite,
|
||||
fit_to_old_edge, ids_json, is_live_paint, json, number_or, object_param, paint_from, po, point_param, repaint_from, replace_roots, root_ids,
|
||||
source_nodes, source_shapes, switch_or,
|
||||
};
|
||||
|
||||
/// `options` as stored on a Live Paint group: none for the defaults.
|
||||
@@ -187,11 +187,16 @@ fn merge_live(d: &mut Document, sel: &mut Selection, roots: &[NodeId]) -> Result
|
||||
.ok_or_else(|| EngineError::Other("Live Paint Merge: select a Live Paint group and the paths to add".into()))?;
|
||||
check_live_paint_takes(d, roots)?;
|
||||
let old = d.node(target).cloned().ok_or(EngineError::NoNode(target))?;
|
||||
// The rows that join are children of the group already when Merge runs after a drag, and a joining
|
||||
// path named like a face or an edge is not one of the group's parts.
|
||||
let mut old_parts = old.clone();
|
||||
if let Some(ch) = old_parts.children_mut() {
|
||||
ch.retain(|c| !roots.contains(&c.id));
|
||||
}
|
||||
// Paint to carry over: (point inside face, paint) for faces that draw; edges are matched to the
|
||||
// old edges below.
|
||||
let keep_faces: Vec<(Point, Carried)> =
|
||||
b::faces(&old).iter().filter(|f| draws(f)).filter_map(|f| Some((po::interior_point(f.path_data()?)?, Carried::of(f)))).collect();
|
||||
let old_parts = old.clone();
|
||||
b::faces(&old_parts).iter().filter(|f| draws(f)).filter_map(|f| Some((po::interior_point(f.path_data()?)?, Carried::of(f)))).collect();
|
||||
let mut sources = source_nodes(&old);
|
||||
// The objects drawn in the other Live Paint groups besides their parts stay in the merged group.
|
||||
let mut others = vec![];
|
||||
@@ -335,6 +340,9 @@ fn spot_in(d: &Document, parent: Option<NodeId>) -> Spot {
|
||||
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>)>,
|
||||
/// The Live Paint group the rows go among the children of, with its sources group as it is
|
||||
/// before the move.
|
||||
keep_sources: Option<(NodeId, NodeId)>,
|
||||
/// The Live Paint groups whose paths change.
|
||||
rebuild: Vec<NodeId>,
|
||||
}
|
||||
@@ -369,7 +377,11 @@ impl LivePaintMove {
|
||||
if to != Spot::Outside {
|
||||
check_live_paint_takes(d, &entering)?;
|
||||
}
|
||||
Ok(Self { join, rebuild })
|
||||
let keep_sources = match to {
|
||||
Spot::In(g) => d.node(g).and_then(b::sources).map(|s| (g, s.id)),
|
||||
_ => None,
|
||||
};
|
||||
Ok(Self { join, keep_sources, rebuild })
|
||||
}
|
||||
|
||||
/// Whether rows join a Live Paint group, which makes the move a "Merge Live Paint" step.
|
||||
@@ -382,6 +394,17 @@ impl LivePaintMove {
|
||||
/// joined a group to it. → `moved` with the joined rows replaced by their group, once, and
|
||||
/// without the faces and edges that were made again.
|
||||
pub(crate) fn finish(self, d: &mut Document, sel: &mut Selection, moved: &[NodeId]) -> Result<Vec<NodeId>> {
|
||||
// A moved object named like the sources group may now sit before it, where a lookup by name
|
||||
// finds the object first. The group's own sources group goes back in front.
|
||||
if let Some((g, src)) = self.keep_sources {
|
||||
let ch = d.children_mut(Some(g))?;
|
||||
if let Some(at) = ch.iter().position(|c| c.id == src)
|
||||
&& ch[..at].iter().any(|c| c.name.as_deref() == Some(SOURCES_NAME))
|
||||
{
|
||||
let s = ch.remove(at);
|
||||
ch.insert(0, s);
|
||||
}
|
||||
}
|
||||
if self.join.is_none() && self.rebuild.is_empty() {
|
||||
return Ok(moved.to_vec());
|
||||
}
|
||||
|
||||
@@ -5198,6 +5198,64 @@ fn layers_drag_adds_paths_to_a_live_paint_group() {
|
||||
assert_eq!(faces(&node(&s, g)).len(), 7);
|
||||
}
|
||||
|
||||
/// A path named like a Live Paint group's sources group joins the group when it is dragged in, in
|
||||
/// front of the sources group or behind it: the group keeps its own sources group and the path
|
||||
/// goes among its paths.
|
||||
#[test]
|
||||
fn layers_drag_of_a_path_named_like_the_sources_group_joins_a_live_paint_group() {
|
||||
use vectorcraft_tools::builder::{SOURCES_NAME, faces, sources};
|
||||
for index in [0, 99] {
|
||||
let mut s = session();
|
||||
let g = live(&mut s);
|
||||
let a = line_to_right_face(&mut s, 30.0);
|
||||
s.execute("object.setProps", &json!({"id": a.0, "name": SOURCES_NAME})).unwrap();
|
||||
s.execute("node.move", &json!({"id": a.0, "parent": g.0, "index": index})).unwrap();
|
||||
assert_eq!(undo_label(&s).as_deref(), Some("Merge Live Paint"), "index {index}");
|
||||
let n = node(&s, g);
|
||||
let src = sources(&n).unwrap();
|
||||
assert!(src.children().is_some(), "index {index}: the sources group is a group");
|
||||
assert_eq!(s.doc().unwrap().doc.parent_of(a), Some(src.id), "index {index}: the path joined the sources");
|
||||
assert_eq!(faces(&n).len(), 5, "index {index}");
|
||||
}
|
||||
}
|
||||
|
||||
/// An object drawn in a Live Paint group and named like its sources group can be moved ahead of the
|
||||
/// sources group: the group keeps its own sources group and stays a Live Paint group.
|
||||
#[test]
|
||||
fn layers_reorder_of_an_object_named_like_the_sources_group_keeps_the_live_paint_group() {
|
||||
use vectorcraft_tools::builder::{SOURCES_NAME, is_live_paint, sources};
|
||||
let mut s = session();
|
||||
let g = live(&mut s);
|
||||
let real = sources(&node(&s, g)).unwrap().id;
|
||||
s.execute("object.isolate", &json!({"id": g.0})).unwrap();
|
||||
let a = line_across(&mut s, 50.0);
|
||||
assert_eq!(s.doc().unwrap().doc.parent_of(a), Some(g));
|
||||
s.execute("object.setProps", &json!({"id": a.0, "name": SOURCES_NAME})).unwrap();
|
||||
s.execute("node.move", &json!({"id": a.0, "parent": g.0, "index": 0})).unwrap();
|
||||
let n = node(&s, g);
|
||||
assert!(is_live_paint(&n));
|
||||
assert_eq!(sources(&n).unwrap().id, real);
|
||||
assert_eq!(s.doc().unwrap().doc.parent_of(a), Some(g), "the object stays where it was drawn");
|
||||
}
|
||||
|
||||
/// A path named `Face` that is dragged into a Live Paint group is not one of its faces: the face it
|
||||
/// covers keeps its own fill.
|
||||
#[test]
|
||||
fn layers_drag_of_a_path_named_face_does_not_repaint_the_group() {
|
||||
use vectorcraft_tools::builder::{face_at, faces};
|
||||
let green = Paint::solid(Color::from_hex("#00ff00").unwrap());
|
||||
let mut s = session();
|
||||
let g = live(&mut s);
|
||||
s.execute("livePaint.fill", &json!({"group": g.0, "point": [25, 50], "color": "#00ff00"})).unwrap();
|
||||
let a = rect(&mut s, 0.0, 0.0, 50.0, 100.0);
|
||||
set_fill(&mut s, a, Color::rgb(0.0, 0.0, 1.0));
|
||||
s.execute("object.setProps", &json!({"id": a.0, "name": "Face"})).unwrap();
|
||||
s.execute("node.move", &json!({"id": a.0, "parent": g.0, "index": 99})).unwrap();
|
||||
let n = node(&s, g);
|
||||
assert_eq!(faces(&n).len(), 3);
|
||||
assert_eq!(face_at(&n, Point::new(25.0, 50.0)).unwrap().appearance.fill_paint(), green);
|
||||
}
|
||||
|
||||
/// An Alt-drag into a Live Paint group adds a copy and leaves the path where it was; a drop above
|
||||
/// one of the group's faces, and `node.move` into the group, add the path the same way.
|
||||
#[test]
|
||||
|
||||
Reference in New Issue
Block a user