From acee3b030baf4df24a871e56789772c677b66bcf Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Wed, 17 Jan 2024 15:31:29 +0100
Subject: Fix paths with negative coordinates in `iced_tiny_skia`

---
 tiny_skia/src/geometry.rs | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'tiny_skia/src/geometry.rs')

diff --git a/tiny_skia/src/geometry.rs b/tiny_skia/src/geometry.rs
index b00f4676..501638e0 100644
--- a/tiny_skia/src/geometry.rs
+++ b/tiny_skia/src/geometry.rs
@@ -40,9 +40,12 @@ impl Frame {
     }
 
     pub fn fill(&mut self, path: &Path, fill: impl Into<Fill>) {
-        let Some(path) = convert_path(path) else {
+        let Some(path) =
+            convert_path(path).and_then(|path| path.transform(self.transform))
+        else {
             return;
         };
+
         let fill = fill.into();
 
         self.primitives
@@ -50,7 +53,6 @@ impl Frame {
                 path,
                 paint: into_paint(fill.style),
                 rule: into_fill_rule(fill.rule),
-                transform: self.transform,
             }));
     }
 
@@ -60,9 +62,12 @@ impl Frame {
         size: Size,
         fill: impl Into<Fill>,
     ) {
-        let Some(path) = convert_path(&Path::rectangle(top_left, size)) else {
+        let Some(path) = convert_path(&Path::rectangle(top_left, size))
+            .and_then(|path| path.transform(self.transform))
+        else {
             return;
         };
+
         let fill = fill.into();
 
         self.primitives
@@ -73,12 +78,13 @@ impl Frame {
                     ..into_paint(fill.style)
                 },
                 rule: into_fill_rule(fill.rule),
-                transform: self.transform,
             }));
     }
 
     pub fn stroke<'a>(&mut self, path: &Path, stroke: impl Into<Stroke<'a>>) {
-        let Some(path) = convert_path(path) else {
+        let Some(path) =
+            convert_path(path).and_then(|path| path.transform(self.transform))
+        else {
             return;
         };
 
@@ -90,7 +96,6 @@ impl Frame {
                 path,
                 paint: into_paint(stroke.style),
                 stroke: skia_stroke,
-                transform: self.transform,
             }));
     }
 
-- 
cgit