mirror of
https://github.com/storytold/wordcraft.git
synced 2026-11-03 08:50:02 -06:00
Fin WarmanandBrandon Thomas
4f2d0da04c
* Shapes: a solid fill keeps its transparency A shape's fill colour can carry a:alpha, its opacity. WordCraft dropped it, so a translucent white wash laid over a picture was drawn opaque and hid the picture. The transparency is now read into the shape, drawn on screen and in the PDF, and written back. * Fix #1600 freeform and soft-edge fill opacity * #1600: wrap canonical caret sampler signature * #1600: format canonical integration * #1600: assert canonical DOCX alpha round-trip * #1600: document canonical shape opacity API * Adapt alpha fixture to rectangle render bounds * docs: one file-format-parity row for soft-edge fill opacity, status line --------- Co-authored-by: Brandon Thomas <echelon@gmail.com>
84 lines
3.3 KiB
Rust
84 lines
3.3 KiB
Rust
use super::*;
|
|
use wordcraft_doc::connector::ShapeExtra;
|
|
use wordcraft_doc::freeform::{FreePath, Freeform, InkTool};
|
|
|
|
#[test]
|
|
fn freeform_fill_has_own_alpha() {
|
|
let rect = Rect::new(4.0, 4.0, 24.0, 24.0);
|
|
for transparency in [0.0, 50.0, 100.0] {
|
|
for closed in [false, true] {
|
|
let freeform = Freeform {
|
|
w: 24.0,
|
|
h: 24.0,
|
|
paths: vec![FreePath { pts: vec![[0.0, 0.0], [24.0, 0.0], [24.0, 24.0]], closed }],
|
|
alpha: 0.25,
|
|
..Default::default()
|
|
};
|
|
let mut out = Vec::new();
|
|
shape_draws(
|
|
rect,
|
|
&ShapeLook {
|
|
kind: ShapeKind::Freeform,
|
|
fill: Some(&wordcraft_doc::fill::Fill::Solid { color: Rgb::BLACK, transparency }),
|
|
stroke: Some(Rgb::WHITE),
|
|
stroke_width: 2.0,
|
|
effects: Default::default(),
|
|
freeform: Some(&freeform),
|
|
extra: &ShapeExtra::default(),
|
|
},
|
|
&DisplayOptions::default(),
|
|
&mut out,
|
|
);
|
|
let Draw::Path { fill, stroke, stroke_width, .. } = &out[0] else { panic!("expected freeform path") };
|
|
match fill {
|
|
Some(Paint::Solid(color, alpha)) if closed => {
|
|
assert_eq!(*color, Rgb::BLACK);
|
|
assert_eq!(*alpha, 1.0 - transparency / 100.0);
|
|
}
|
|
None if !closed => {}
|
|
_ => panic!("unexpected freeform paint: {fill:?}"),
|
|
}
|
|
assert_eq!((*stroke, *stroke_width), (Some(Rgb::WHITE), 2.0));
|
|
}
|
|
}
|
|
let ink = Freeform::ink(InkTool::Highlighter, 24.0, 24.0, vec![[0.0, 0.0], [24.0, 24.0]]);
|
|
let mut out = Vec::new();
|
|
shape_draws(
|
|
rect,
|
|
&ShapeLook {
|
|
kind: ShapeKind::Freeform,
|
|
fill: Some(&wordcraft_doc::fill::Fill::Solid { color: Rgb::BLACK, transparency: 100.0 }),
|
|
stroke: Some(Rgb::WHITE),
|
|
stroke_width: 2.0,
|
|
effects: Default::default(),
|
|
freeform: Some(&ink),
|
|
extra: &ShapeExtra::default(),
|
|
},
|
|
&DisplayOptions::default(),
|
|
&mut out,
|
|
);
|
|
assert!(matches!(out.as_slice(), [Draw::Ink { alpha, .. }] if *alpha == 0.5));
|
|
}
|
|
|
|
#[test]
|
|
fn other_path_alpha_defaults() {
|
|
let rect = Rect::new(4.0, 4.0, 24.0, 24.0);
|
|
let graphic = Graphic {
|
|
items: vec![GraphicItem::Path {
|
|
segs: vec![PathSeg::Move(0.0, 0.0), PathSeg::Line(24.0, 24.0)],
|
|
fill: Some(Rgb::BLACK),
|
|
stroke: None,
|
|
stroke_width: 0.0,
|
|
}],
|
|
..Default::default()
|
|
};
|
|
let mut out = graphic_draws(&Document::new(), &graphic, rect, 1.0);
|
|
out.push(path_arrowhead(&[(4.0, 4.0), (28.0, 28.0)], Rgb::BLACK, 2.0, ArrowStyle::default()).unwrap());
|
|
let extra = ShapeExtra { arrow_start: true, arrow_end: true, ..Default::default() };
|
|
line_draws(rect, ShapeKind::ElbowConnector, Some(Rgb::BLACK), 2.0, Default::default(), &extra, &mut out);
|
|
assert_eq!(out.len(), 5);
|
|
assert!(out.iter().all(
|
|
|item| matches!(item, Draw::Path { fill, .. } if fill.as_ref().is_none_or(|paint| matches!(paint, Paint::Solid(_, alpha) if *alpha == 1.0)))
|
|
));
|
|
}
|