From ffa45ff706c3e6b03c979411f83319133b68ead0 Mon Sep 17 00:00:00 2001
From: LongYinan <lynweklm@gmail.com>
Date: Tue, 19 Nov 2024 00:31:54 +0800
Subject: [PATCH] fix: shadow blur 0 makes text shadow not render at all

---
 __test__/regression.spec.ts                   |  15 +++++++
 .../snapshots/shadow-blur-zero-with-text.png  | Bin 0 -> 3467 bytes
 src/ctx.rs                                    |  37 +++++++++++-------
 3 files changed, 37 insertions(+), 15 deletions(-)
 create mode 100644 __test__/snapshots/shadow-blur-zero-with-text.png

diff --git a/__test__/regression.spec.ts b/__test__/regression.spec.ts
index ad2d1fcf..21bbc926 100644
--- a/__test__/regression.spec.ts
+++ b/__test__/regression.spec.ts
@@ -234,3 +234,18 @@ test('shadow-blur-with-translate', async (t) => {
   ctx.strokeRect(-50, -50, 200, 100)
   await snapshotImage(t, { ctx, canvas })
 })
+
+// https://github.com/Brooooooklyn/canvas/issues/857
+test('shadow-blur-zero-with-text', async (t) => {
+  GlobalFonts.registerFromPath(join(__dirname, 'fonts', 'iosevka-slab-regular.ttf'))
+  const canvas = createCanvas(500, 500)
+  const ctx = canvas.getContext('2d')
+  ctx.font = '48px Iosevka Slab'
+  ctx.shadowBlur = 0
+  ctx.shadowOffsetX = 20
+  ctx.shadowOffsetY = 20
+  ctx.shadowColor = 'red'
+  ctx.fillStyle = 'green'
+  ctx.fillText('TEST', 100, 100)
+  await snapshotImage(t, { ctx, canvas })
+})
diff --git a/__test__/snapshots/shadow-blur-zero-with-text.png b/__test__/snapshots/shadow-blur-zero-with-text.png
new file mode 100644
index 0000000000000000000000000000000000000000..ddf4b7bb90657161d5a987331fffe1f8aca74b29
GIT binary patch
literal 3467
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

literal 0
HcmV?d00001

diff --git a/src/ctx.rs b/src/ctx.rs
index 5cf7f217..c33a759b 100644
--- a/src/ctx.rs
+++ b/src/ctx.rs
@@ -675,21 +675,28 @@ impl Context {
     let r = shadow_color.red;
     let g = shadow_color.green;
     let b = shadow_color.blue;
-    let transform = state.transform.get_transform();
-    let sigma_x = state.shadow_blur / (2f32 * transform.scale_x());
-    let sigma_y = state.shadow_blur / (2f32 * transform.scale_y());
-    let shadow_effect = ImageFilter::make_drop_shadow_only(
-      0.0,
-      0.0,
-      sigma_x,
-      sigma_y,
-      (a as u32) << 24 | (r as u32) << 16 | (g as u32) << 8 | b as u32,
-      None,
-    )?;
-    drop_shadow_paint.set_alpha(shadow_alpha);
-    drop_shadow_paint.set_image_filter(&shadow_effect);
-    let blur_effect = MaskFilter::make_blur(state.shadow_blur / 2f32)?;
-    drop_shadow_paint.set_mask_filter(&blur_effect);
+    if state.shadow_blur == 0f32 {
+      // No blur, so set the paint color to the shadow color without any blur effects
+      drop_shadow_paint.set_color(r, g, b, a);
+    } else {
+      let transform = state.transform.get_transform();
+      let sigma_x = state.shadow_blur / (2f32 * transform.scale_x());
+      let sigma_y = state.shadow_blur / (2f32 * transform.scale_y());
+      // If sigma_x and sigma_y are zero, make_drop_shadow_only will return None
+      // So we need to handle that case separately
+      let shadow_effect = ImageFilter::make_drop_shadow_only(
+        0.0,
+        0.0,
+        sigma_x,
+        sigma_y,
+        (a as u32) << 24 | (r as u32) << 16 | (g as u32) << 8 | b as u32,
+        None,
+      )?;
+      drop_shadow_paint.set_alpha(shadow_alpha);
+      drop_shadow_paint.set_image_filter(&shadow_effect);
+      let blur_effect = MaskFilter::make_blur(state.shadow_blur / 2f32)?;
+      drop_shadow_paint.set_mask_filter(&blur_effect);
+    }
     Some(drop_shadow_paint)
   }