From ed247797ac17e0975d6663d65b0976ab92130d80 Mon Sep 17 00:00:00 2001
From: Eric Biedert <github@ericbiedert.de>
Date: Mon, 5 Aug 2024 12:24:22 +0200
Subject: Fix alignment of gradients and patterns on strokes in PNG (#4634)

---
 crates/typst-render/src/paint.rs | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'crates/typst-render')

diff --git a/crates/typst-render/src/paint.rs b/crates/typst-render/src/paint.rs
index 2b5c19c9..3a507ca4 100644
--- a/crates/typst-render/src/paint.rs
+++ b/crates/typst-render/src/paint.rs
@@ -185,6 +185,12 @@ pub fn to_sk_paint<'a>(
                     .container_transform
                     .post_concat(state.transform.invert().unwrap()),
             };
+
+            let gradient_map = match relative {
+                RelativeTo::Self_ => gradient_map,
+                RelativeTo::Parent => None,
+            };
+
             let width =
                 (container_size.x.to_f32().abs() * state.pixel_per_pt).ceil() as u32;
             let height =
@@ -225,6 +231,13 @@ pub fn to_sk_paint<'a>(
             let canvas = render_pattern_frame(&state, pattern);
             *pixmap = Some(Arc::new(canvas));
 
+            let offset = match relative {
+                RelativeTo::Self_ => {
+                    gradient_map.map(|(offset, _)| -offset).unwrap_or_default()
+                }
+                RelativeTo::Parent => Point::zero(),
+            };
+
             // Create the shader
             sk_paint.shader = sk::Pattern::new(
                 pixmap.as_ref().unwrap().as_ref().as_ref(),
@@ -232,7 +245,8 @@ pub fn to_sk_paint<'a>(
                 sk::FilterQuality::Nearest,
                 1.0,
                 fill_transform
-                    .pre_scale(1.0 / state.pixel_per_pt, 1.0 / state.pixel_per_pt),
+                    .pre_scale(1.0 / state.pixel_per_pt, 1.0 / state.pixel_per_pt)
+                    .pre_translate(offset.x.to_f32(), offset.y.to_f32()),
             );
         }
     }
-- 
cgit v1.2.3