Skip to content

DesignCraft: An open-source page and layout design editor written by scratch in pure Rust

Integration: #823 a radial gradient on a box with no width or height is a circle across it

aiongg6db40bdbb529
diff --git a/crates/doc/src/item.rs b/crates/doc/src/item.rs
index e832fa359..1478608a8 100644
--- a/crates/doc/src/item.rs
+++ b/crates/doc/src/item.rs
@@ -44,7 +44,13 @@ impl Fill {
let r = designcraft_geom::Vec2::new(x1 - x0, (y1 - y0) / k).hypot();
(designcraft_geom::Point::new(x0, y0), r, r * k)
}
- None => (b.center(), b.width().max(1e-9) / 2.0, b.height().max(1e-9) / 2.0),
+ // A box with no width or height (a straight line's) has no ellipse: a circle across
+ // its length.
+ None if b.width() <= 1e-9 || b.height() <= 1e-9 => {
+ let r = b.width().max(b.height()).max(1e-3) / 2.0;
+ (b.center(), r, r)
+ }
+ None => (b.center(), b.width() / 2.0, b.height() / 2.0),
}
}
diff --git a/crates/engine/src/cmd/style.rs b/crates/engine/src/cmd/style.rs
index 8200423b3..a1d47b3e7 100644
--- a/crates/engine/src/cmd/style.rs
+++ b/crates/engine/src/cmd/style.rs
@@ -2910,4 +2910,49 @@ mod gradient_stroke_tests {
assert!(a > 215 && b < 40, "dragged: {a} {b}");
assert!(s.execute("object.gradient", &json!({"ids": [id], "target": "gap"})).is_err());
}
+
+ /// A 20 pt horizontal line with a gradient on its stroke, drawn on screen and from its PDF.
+ fn line_with_stroke_gradient(g: serde_json::Value) -> (designcraft_render::Rendered, designcraft_render::Rendered) {
+ let mut s = crate::Session::new();
+ s.execute("file.new", &json!({"width": 200, "height": 120, "facingPages": false})).unwrap();
+ let id = s.execute("line.create", &json!({"a": [20, 60], "b": [180, 60]})).unwrap()["id"].as_u64().unwrap();
+ s.execute("object.stroke", &json!({"ids": [id], "weight": 20})).unwrap();
+ let mut g = g;
+ g["ids"] = json!([id]);
+ g["target"] = json!("stroke");
+ s.execute("object.gradient", &g).unwrap();
+ let d = s.doc().unwrap().doc.clone();
+ let mut rr = designcraft_render::Renderer::new();
+ let screen = rr.render_page(&d, &s.cache, 0, 1.0, false, &Default::default()).unwrap();
+ let pdf = designcraft_pdf::export_pdf(&d, &s.cache, &Default::default()).unwrap();
+ let mut p = crate::Session::new();
+ p.execute("file.new", &json!({"width": 200, "height": 120, "facingPages": false})).unwrap();
+ p.execute("file.place", &json!({"base64": crate::cmd::file::base64_encode(&pdf), "name": "line.pdf", "x": 0, "y": 0, "width": 200}))
+ .unwrap();
+ let pd = p.doc().unwrap().doc.clone();
+ let placed = rr.render_page(&pd, &p.cache, 0, 1.0, false, &Default::default()).unwrap();
+ (screen, placed)
+ }
+
+ #[test]
+ fn a_radial_gradient_on_a_straight_lines_stroke_shows_all_its_stops() {
+ // The line's box has no height: the gradient is a circle across the line's length.
+ let (screen, pdf) = line_with_stroke_gradient(
+ json!({"kind": "radial", "stops": [{"location": 0, "color": "#000000"}, {"location": 100, "color": "#ffffff"}]}),
+ );
+ for (what, img) in [("screen", &screen), ("pdf", &pdf)] {
+ let (a, m, b) = along(img);
+ assert!(m < 40 && a > 180 && b > 180, "{what}: {a} {m} {b}");
+ }
+ }
+
+ #[test]
+ fn a_linear_gradient_across_a_straight_line_paints_its_stroke_alike_on_screen_and_in_pdf() {
+ let (screen, pdf) = line_with_stroke_gradient(
+ json!({"angle": 90, "stops": [{"location": 0, "color": "#ff0000"}, {"location": 100, "color": "#0000ff"}]}),
+ );
+ let (s, p) = (screen.pixel(100, 60), pdf.pixel(100, 60));
+ assert!(s[1] < 60 && s[0].max(s[2]) > 150, "screen: the stroke is painted, {s:?}");
+ assert!((0..3).all(|i| s[i].abs_diff(p[i]) < 40), "screen {s:?}, pdf {p:?}");
+ }
}