fix: y offset when textBaseline is bottom

Brooooooklyn · May 30, 2022 · 26fdc3c · 26fdc3c
1 parent 51f6493
commit 26fdc3c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/__test__/snapshots/text-baseline.png b/__test__/snapshots/text-baseline.png
diff --git a/__test__/text.spec.ts b/__test__/text.spec.ts
@@ -62,3 +62,13 @@ test(`measureText with suffix spaces`, async (t) => {
   t.is(ctx.measureText(' ').width, widthWithSpace - width)
   t.is(ctx.measureText('  ').width, widthWithTwoSpace - width)
 })
+
+// https://github.com/Brooooooklyn/canvas/issues/386
+test('text-baseline', async (t) => {
+  const { ctx } = t.context
+  ctx.font = '48px Iosevka Slab'
+  ctx.textBaseline = 'bottom'
+  ctx.fillText('abcdef', 50, 50)
+  ctx.fillText('abcdefg', 50, 50)
+  await snapshotImage(t)
+})
diff --git a/skia-c/skia_c.cpp b/skia-c/skia_c.cpp
@@ -425,7 +425,7 @@ extern "C"
       baseline_offset = -alphabetic_baseline - font_metrics.fAscent;
       break;
     case CssBaseline::Hanging:
-      // https://github1s.com/chromium/chromium/blob/HEAD/third_party/blink/renderer/core/html/canvas/text_metrics.cc#L21-L24
+      // https://github.com/chromium/chromium/blob/104.0.5092.1/third_party/blink/renderer/core/html/canvas/text_metrics.cc#L21-L25
       // According to
       // http://wiki.apache.org/xmlgraphics-fop/LineLayout/AlignmentHandling
       // "FOP (Formatting Objects Processor) puts the hanging baseline at 80% of
@@ -442,7 +442,7 @@ extern "C"
       baseline_offset = -paragraph->getIdeographicBaseline();
       break;
     case CssBaseline::Bottom:
-      baseline_offset = -alphabetic_baseline - descent;
+      baseline_offset = font_metrics.fStrikeoutPosition;
       break;
     };