Allow independent corner radii for RoundedRect

src/arc.rs

@@ -1,4 +1,4 @@
-//! A circle arc.
+//! An ellipse arc.
 
 use crate::{PathEl, Point, Rect, Shape, Vec2};
 use std::{
@@ -30,7 +30,7 @@ impl Arc {
     pub fn append_iter(&self, tolerance: f64) -> ArcAppendIter {
         let sign = self.sweep_angle.signum();
         let scaled_err = self.radii.x.max(self.radii.y) / tolerance;
-        // Number of subdivisions per circle based on error tolerance.
+        // Number of subdivisions per ellipse based on error tolerance.
         // Note: this may slightly underestimate the error for quadrants.
         let n_err = (1.1163 * scaled_err).powf(1.0 / 6.0).max(3.999_999);
         let n = (n_err * self.sweep_angle.abs() * (1.0 / (2.0 * PI))).ceil();

src/lib.rs

@@ -92,6 +92,7 @@ mod point;
 mod quadbez;
 mod rect;
 mod rounded_rect;
+mod rounded_rect_radii;
 mod shape;
 mod size;
 mod svg;
@@ -111,6 +112,7 @@ pub use crate::point::*;
 pub use crate::quadbez::*;
 pub use crate::rect::*;
 pub use crate::rounded_rect::*;
+pub use crate::rounded_rect_radii::*;
 pub use crate::shape::*;
 pub use crate::size::*;
 pub use crate::svg::*;

src/rect.rs

@@ -3,7 +3,7 @@
 use std::fmt;
 use std::ops::{Add, Sub};
 
-use crate::{Ellipse, Insets, PathEl, Point, RoundedRect, Shape, Size, Vec2};
+use crate::{Ellipse, Insets, PathEl, Point, RoundedRect, RoundedRectRadii, Shape, Size, Vec2};
 
 /// A rectangle.
 #[derive(Clone, Copy, Default, PartialEq)]
@@ -442,8 +442,8 @@ impl Rect {
     /// Creates a new [`RoundedRect`] from this `Rect` and the provided
     /// corner radius.
     #[inline]
-    pub fn to_rounded_rect(self, radius: f64) -> RoundedRect {
-        RoundedRect::from_rect(self, radius)
+    pub fn to_rounded_rect(self, radii: RoundedRectRadii) -> RoundedRect {
+        RoundedRect::from_rect(self, radii)
     }
 
     /// Returns the [`Ellipse`] that is bounded by this `Rect`.