mirror of
https://github.com/storytold/vectorcraft.git
synced 2026-10-27 19:27:21 -06:00
Lossless gradient params carried a saved gradient's vector (document coordinates of the art it came from) into swatch applications and the default paint, so a swatch applied elsewhere, or the next shape drawn, got a gradient placed off the object. Applying a gradient swatch now fits it to each object (keeping its aspect, on type in text space), and the default for new art keeps all but the placement. Saving a swatch stays lossless. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
164 lines
6.4 KiB
Rust
164 lines
6.4 KiB
Rust
//! Fill and stroke paint (the toolbar proxies and their defaults) and the Transparency panel.
|
|
|
|
use serde_json::{Value, json};
|
|
use vectorcraft_color::{Color, Paint};
|
|
use vectorcraft_doc::{Appearance, NodeKind};
|
|
|
|
use super::gradient::{place_paint, place_run_paint, run_paint_mut, unplaced};
|
|
use super::*;
|
|
use crate::EngineError;
|
|
|
|
pub fn specs() -> Vec<CommandSpec> {
|
|
vec![
|
|
cmd!(
|
|
"paint.setFill",
|
|
"Fill",
|
|
[],
|
|
None,
|
|
"{color?: \"#rrggbb\"|[r,g,b]|{c,m,y,k}|{gray}, none?: true, swatch?: name (a gradient swatch fits each object, keeping its aspect), gradient?: {kind?: linear|radial|freeform, stops?: [{offset 0..1, color, opacity? 0..1 (or 0..100), midpoint? 0.13..0.87}] (at least 2; default white→black), angle?: deg, start?: [x,y], end?: [x,y] (the vector in document coordinates, both or neither; type objects keep it in text space), aspect?: % (radial; without start/end the gradient is placed on each object's bounds), swatch?: linked gradient swatch name}, ids?} sets selection fill and the default (new art fits a gradient to itself)",
|
|
has_doc,
|
|
|s, p| set_paint(s, p, true)
|
|
),
|
|
cmd!("paint.setStroke", "Stroke", [], None, "same as paint.setFill, for the stroke", has_doc, |s, p| set_paint(s, p, false)),
|
|
cmd!("paint.swap", "Swap Fill and Stroke", [], Some("Shift+X"), "{}", has_doc, swap),
|
|
cmd!("paint.default", "Default Fill and Stroke", [], Some("D"), "{}", has_doc, default_paint),
|
|
cmd!("paint.toggleActive", "Toggle Fill/Stroke Focus", [], Some("X"), "{}", always, |s, _| {
|
|
s.fill_active = !s.fill_active;
|
|
Ok(json!({ "fillActive": s.fill_active }))
|
|
}),
|
|
cmd!("paint.none", "None", [], Some("/"), "{} set the active proxy (fill or stroke) to None", has_doc, |s, _| {
|
|
let f = s.fill_active;
|
|
set_paint(s, &json!({"none": true}), f)
|
|
}),
|
|
cmd!(
|
|
"transparency.set",
|
|
"Transparency",
|
|
["Window", "Transparency"],
|
|
None,
|
|
"{opacity?: 0..100, blend?: name, isolate?, knockout?}",
|
|
has_selection,
|
|
transparency
|
|
),
|
|
]
|
|
}
|
|
|
|
/// Parse a paint from params (color / none / swatch / gradient). None = no paint keys given.
|
|
pub(crate) fn paint_from(s: &Session, p: &Value) -> Result<Option<Paint>> {
|
|
if bool_or(p, "none", false) {
|
|
return Ok(Some(Paint::None));
|
|
}
|
|
if let Some(name) = str_param(p, "swatch") {
|
|
let st = s.doc()?;
|
|
// A pattern definition works as its swatch even without a swatch entry.
|
|
if st.doc.swatch(name).is_none() && st.doc.pattern(name).is_some() {
|
|
return Ok(Some(vectorcraft_doc::pattern::pattern_paint(name)));
|
|
}
|
|
let sw = st.doc.swatch(name).ok_or_else(|| EngineError::Other(format!("no swatch `{name}`")))?;
|
|
let mut paint = sw.paint.clone();
|
|
if sw.global
|
|
&& let Paint::Solid { swatch, .. } = &mut paint
|
|
{
|
|
*swatch = Some(name.to_string());
|
|
}
|
|
return Ok(Some(paint));
|
|
}
|
|
if let Some(g) = p.get("gradient") {
|
|
let gp = super::gradient::parse_gradient(g).map_err(|e| bad("paint", e))?;
|
|
return Ok(Some(Paint::Gradient(Box::new(gp))));
|
|
}
|
|
if let Some(c) = p.get("color") {
|
|
let c = color_value(c).ok_or_else(|| bad("paint", format!("bad color {c}")))?;
|
|
return Ok(Some(Paint::solid(c)));
|
|
}
|
|
Ok(None)
|
|
}
|
|
|
|
fn set_paint(s: &mut Session, p: &Value, fill: bool) -> Result<Value> {
|
|
let paint = paint_from(s, p)?.ok_or_else(|| bad("paint.setFill", "give color, none, swatch or gradient"))?;
|
|
// New art gets the paint fitted to itself, not placed where this one is.
|
|
if fill {
|
|
s.paint.fill = unplaced(&paint);
|
|
} else {
|
|
s.paint.stroke = unplaced(&paint);
|
|
}
|
|
s.fill_active = fill;
|
|
let ids = paint_targets(s, p)?;
|
|
if ids.is_empty() {
|
|
return ok();
|
|
}
|
|
s.edit(if fill { "Fill Color" } else { "Stroke Color" }, |d, _| {
|
|
for id in &ids {
|
|
let Some(n) = d.node_mut(*id) else { continue };
|
|
if let NodeKind::Text(t) = &mut n.kind {
|
|
let (xf, lb) = (t.xf, t.local_bounds());
|
|
for r in &mut t.runs {
|
|
if !fill && r.style.stroke_width == 0.0 {
|
|
r.style.stroke_width = 1.0;
|
|
}
|
|
let (cur, b) = run_paint_mut(r, !fill, lb);
|
|
*cur = place_run_paint(&paint, p, xf, b);
|
|
}
|
|
continue;
|
|
}
|
|
let b = n.geometric_bounds();
|
|
if fill {
|
|
n.appearance.set_fill(place_paint(&paint, p, b));
|
|
} else {
|
|
n.appearance.set_stroke(paint.clone());
|
|
if let Some(st) = n.appearance.stroke_mut() {
|
|
st.paint = place_paint(&paint, p, b.map(|b| st.paint_bounds(b)));
|
|
}
|
|
}
|
|
}
|
|
Ok(())
|
|
})?;
|
|
ok()
|
|
}
|
|
|
|
fn swap(s: &mut Session, _: &Value) -> Result<Value> {
|
|
std::mem::swap(&mut s.paint.fill, &mut s.paint.stroke);
|
|
let ids = paint_targets(s, &json!({}))?;
|
|
if !ids.is_empty() {
|
|
s.edit("Swap Fill and Stroke", |d, _| {
|
|
for id in &ids {
|
|
if let Some(n) = d.node_mut(*id) {
|
|
let f = n.appearance.fill_paint();
|
|
let st = n.appearance.stroke_paint();
|
|
n.appearance.set_fill(st);
|
|
n.appearance.set_stroke(f);
|
|
}
|
|
}
|
|
Ok(())
|
|
})?;
|
|
}
|
|
ok()
|
|
}
|
|
|
|
fn default_paint(s: &mut Session, _: &Value) -> Result<Value> {
|
|
s.paint.fill = Paint::solid(Color::WHITE);
|
|
s.paint.stroke = Paint::solid(Color::BLACK);
|
|
s.paint.stroke_width = 1.0;
|
|
let ids = paint_targets(s, &json!({}))?;
|
|
if !ids.is_empty() {
|
|
s.edit("Default Fill and Stroke", |d, _| {
|
|
for id in &ids {
|
|
if let Some(n) = d.node_mut(*id)
|
|
&& !matches!(n.kind, NodeKind::Text(_))
|
|
{
|
|
n.appearance = Appearance::default_art();
|
|
}
|
|
}
|
|
Ok(())
|
|
})?;
|
|
}
|
|
ok()
|
|
}
|
|
|
|
fn transparency(s: &mut Session, p: &Value) -> Result<Value> {
|
|
let mut q = p.clone();
|
|
if let Some(o) = p.get("opacity").and_then(Value::as_f64) {
|
|
q["opacity"] = json!(o / 100.0);
|
|
}
|
|
s.execute("object.setProps", &q)
|
|
}
|