Support individual corner radii for kurbo::RoundedRect #391
Conversation
I'd love to see #389 go in, though I consider it pretty high risk. I don't think #387 is ready, as there are serious unresolved questions in the Direct2D port in particular (and those are not just implementation details, but point to deeper architectural concerns imho). |
|
The most recent commit addresses a major oversight when rendering in Direct2D. See the top-middle here: versus here: Sample image 6 has also been updated. I'll have a PR for piet-snapshots shortly. |
There was a problem hiding this comment.
One note that is totally not a blocker, otherwise this looks good to me. I've merged the piet-snapshots PR, so you should be able to update the submodule in this PR and then we'll pass CI (except for this funny wasm failure that I don't think is your fault..)
piet-direct2d/src/lib.rs
Outdated
| match path_from_shape(self.factory, true, shape, fill_rule) { | ||
| Ok(geom) => self.rt.fill_geometry(&geom, &brush, None), | ||
| Err(e) => self.err = Err(e), | ||
| if let Some(radius) = round_rect.radii().as_single_radius() { |
There was a problem hiding this comment.
I think we can keep this as before, just changing,
if let Some(round_rect) = shape.as_rounded_rect().filter(|r| r.as_single_radius().is_some()) {
}This isn't a major point, but it cleans up the diff somewhat.
|
Okay, I'll update this soon. I was really hoping for a better way to do that, because my version feels really clunky. |
|
That was just sloppy, sorry. I forgot that building and testing Now the snapshots are still failing. Not sure what's going on, since they're freshly updated. I'll poke at this more when I get time next, but that may be a couple days. |
Update for piet#391 (2)
This PR adds support for this Kurbo patch. This PR points directly at my Kurbo fork, so it probably shouldn't be merged until the Kurbo PR is merged and a new Kurbo version is published.
piet-coregraphicsandpiet-cairoboth get this feature for free, because both platforms use paths for rounded rectangles. I have tested both platforms and verified this.piet-webshould get this feature for free as well, for the same reason. I have not explicitly tested this, but I feel confident about it sinceto_pathis well-tested and is not platform-specific, and RoundedRect is not mentioned in the code.In
piet-svg, this has been implemented by simply using a bezier curve if the corner radii aren't all equal, and a rounded rectangle if they are. Rounded rectangles in SVG can only have a single radius, and while it's possible to use some clipping magic, I don't think it's worth the effort.Inpiet-direct2d, this has been implemented by drawing four rounded rectangles, one for each corner. They are clipped using an axis-aligned clip, which is faster than masking with a shape. If all corner radii are equal, a single rounded rectangle is drawn.piet-direct2dhas a similar implementation topiet-svg.