fix: quad rendering including border only inside of the bounds

pop-os · Feb 6, 2024 · 9d9d078 · peterkrull · Aug 5, 2024 · wash2
1 parent eed4f5c
commit 9d9d078
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
@@ -177,12 +177,20 @@ impl Backend {
                     .min(bounds.height / 2.0);
 
                 let mut fill_border_radius = <[f32; 4]>::from(border.radius);
+                // Offset the fill by the border width
+                let path_bounds = Rectangle {
+                    x: bounds.x + border_width,
+                    y: bounds.y + border_width,
+                    width: bounds.width - 2.0 * border_width,
+                    height: bounds.height - 2.0 * border_width,
+                };
+                // fill border radius is the border radius minus the border width
                 for radius in &mut fill_border_radius {
-                    *radius = (*radius)
-                        .min(bounds.width / 2.0)
-                        .min(bounds.height / 2.0);
+                    *radius = (*radius - border_width / 2.0)
+                        .min(path_bounds.width / 2.0)
+                        .min(path_bounds.height / 2.0);
                 }
-                let path = rounded_rectangle(*bounds, fill_border_radius);
+                let path = rounded_rectangle(path_bounds, fill_border_radius);
 
                 if shadow.color.a > 0.0 {
                     let shadow_bounds = (Rectangle {