aleleba/vectorcraft
1
0
Fork 0
mirror of https://github.com/storytold/vectorcraft.git synced 2026-10-29 20:27:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

Paint: a fill or stroke given to a compound path's member paints the compound path (#3692)

Browse Source
This commit is contained in:
Gert Pellin
2026-10-23 03:22:54 +07:00
committed by bflatastic
parent 8bf7ffe39d
commit 368fa3def2
4 changed files with 103 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/engine/src/cmd/mod.rs
+6 -2
View File
@@ -477,10 +477,12 @@ pub(crate) fn ok() -> Result<Value> {
}
/// Leaves whose appearance a paint command changes: groups and layers expand to their contents,
/// and compound paths own their children's appearance.
/// and compound paths own their children's appearance, so a member stands for its compound path
/// (#3692), which is listed once.
pub(crate) fn leaf_targets(s: &Session, ids: &[NodeId]) -> Result<Vec<NodeId>> {
use vectorcraft_doc::NodeKind;
let d = &s.doc()?.doc;
let compound = |id: NodeId| d.parent_of(id).filter(|p| matches!(d.node(*p).map(|n| &n.kind), Some(NodeKind::Compound { .. })));
let mut out = vec![];
for id in ids {
let Some(n) = d.node(*id) else { continue };
@@ -490,11 +492,13 @@ pub(crate) fn leaf_targets(s: &Session, ids: &[NodeId]) -> Result<Vec<NodeId>> {
out.push(c.id)
}
}),
_ => out.push(*id),
_ => out.push(compound(*id).unwrap_or(*id)),
}
}
let comp: Vec<NodeId> = out.iter().filter(|id| matches!(d.node(**id).map(|n| &n.kind), Some(NodeKind::Compound { .. }))).copied().collect();
out.retain(|id| !comp.iter().any(|c| d.parent_of(*id) == Some(*c)));
let mut seen = std::collections::HashSet::new();
out.retain(|id| seen.insert(*id));
Ok(out)
}