aleleba/vectorcraft
1
0
Fork 0
mirror of https://github.com/storytold/vectorcraft.git synced 2026-10-26 18:56:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge wp/A1

Browse Source
This commit is contained in:
bflatastic
2026-10-04 21:46:02 +07:00
parent 0af6734b70 8910f8fd1e
commit 1ae0c22c26
23 changed files with 2002 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/render/src/proof.rs
+2 -2
View File
@@ -58,7 +58,7 @@ pub fn plates(doc: &Document) -> Vec<Plate> {
Plate { name: (*n).into(), spot: false, rgb: c.cmyk_to_srgb(ink, false) }
})
.collect();
for sw in &doc.swatches {
for sw in doc.swatches_iter() {
if let (true, Paint::Solid { color, .. }) = (sw.spot, &sw.paint)
&& !v.iter().any(|p| p.name == sw.name)
{
@@ -69,7 +69,7 @@ pub fn plates(doc: &Document) -> Vec<Plate> {
}
fn spot_swatch<'a>(doc: &'a Document, name: &str) -> Option<&'a Color> {
doc.swatches.iter().find(|s| s.spot && s.name == name).and_then(|s| match &s.paint {
doc.swatch(name).filter(|s| s.spot).and_then(|s| match &s.paint {
Paint::Solid { color, .. } => Some(color),
_ => None,
})