EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust
#1342: preserve gradient stroke widths in the toolbar
Kristian Myram238fe6cd2a23
diff --git a/crates/engine/src/cmd/shape_stroke.rs b/crates/engine/src/cmd/shape_stroke.rsindex ecd3ed8e0..6bb09654b 100644--- a/crates/engine/src/cmd/shape_stroke.rs+++ b/crates/engine/src/cmd/shape_stroke.rs@@ -205,7 +205,8 @@ const PATHS: [&str; 4] = ["rect", "ellipse", "star", "path"];pub(crate) const MAX_DEPTH: usize = 64;/// The first Fill colour, Stroke colour and Stroke Width in `layer`'s contents at layer time-/// `lt` (what the toolbar shows for a selected shape layer).+/// `lt` (what the toolbar shows for a selected shape layer). Width comes from the first Stroke+/// or Gradient Stroke, independently of the first solid stroke's colour.pub fn first_paint(layer: &Layer, lt: Tick) -> (Option<[f64; 4]>, Option<[f64; 4]>, Option<f64>) {let (mut fill, mut stroke, mut width) = (None, None, None);if let Some(c) = layer.props.sub("contents") {@@ -216,10 +217,12 @@ pub fn first_paint(layer: &Layer, lt: Tick) -> (Option<[f64; 4]>, Option<[f64; 4"fill" if fill.is_none() => fill = at("color").map(rgba),"stroke" if stroke.is_none() => {stroke = at("color").map(rgba);- width = at("width").map(|v| v.as_f64());}_ => {}}+ if width.is_none() && is_stroke(g) {+ width = at("width").map(|v| v.as_f64());+ }});}(fill, stroke, width)diff --git a/crates/engine/src/tests/session.rs b/crates/engine/src/tests/session.rsindex a29de9f1c..f2dcca49c 100644--- a/crates/engine/src/tests/session.rs+++ b/crates/engine/src/tests/session.rs@@ -320,6 +320,26 @@ fn toolbar_fill_and_stroke_paint_selected_shape_layers() {let _ = s.render(cid, s.time(), Default::default());}+/// The toolbar/query width follows the selected solid or gradient stroke, including animation.+#[test]+fn shape_toolbar_reads_solid_and_gradient_stroke_widths_at_the_current_time() {+ for kind in ["solid", "linear", "radial"] {+ let mut s = Session::default();+ s.execute("comp.new", json!({"width": 400, "height": 300, "duration": 2})).unwrap();+ let layer = s.execute("layer.newShape", json!({"kind": "rect"})).unwrap()["layer"].as_u64().unwrap();+ let configured = s.execute("shape.fillStroke", json!({"fill": false, "strokeType": kind, "strokeWidth": 9})).unwrap();+ assert_eq!(configured["strokeWidth"].as_f64(), Some(9.0), "configured {kind} stroke");+ let group = if kind == "solid" { "stroke" } else { "gstroke" };+ let path = format!("contents/group/contents/{group}/width");+ for (time, width) in [(0, 9), (1, 17)] {+ s.execute("prop.addKey", json!({"layer": layer, "path": path, "time": time, "value": width})).unwrap();+ }+ s.set_time(effectcraft_time::Tick::from_seconds_f64(1.0));+ let displayed = s.execute("shape.fillStroke", json!({})).unwrap();+ assert_eq!(displayed["strokeWidth"].as_f64(), Some(17.0), "animated {kind} stroke");+ }+}+/// A Wiggle Paths saved without Spatial Phase gets the property, at 0°, after Temporal Phase when/// the project opens.#[test]