From 931e9ff72feb4924bcf4ff51146c37030f55a541 Mon Sep 17 00:00:00 2001 From: LongCat is Looong <31859944+LongCatIsLooong@users.noreply.github.com> Date: Thu, 15 Feb 2024 15:32:41 -0800 Subject: [PATCH 1/2] Turn struct halfleading in canvaskit kitchensink test back on --- lib/web_ui/test/canvaskit/canvaskit_api_test.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/web_ui/test/canvaskit/canvaskit_api_test.dart b/lib/web_ui/test/canvaskit/canvaskit_api_test.dart index 6a1fea063ef34..514ad95ded270 100644 --- a/lib/web_ui/test/canvaskit/canvaskit_api_test.dart +++ b/lib/web_ui/test/canvaskit/canvaskit_api_test.dart @@ -1596,7 +1596,7 @@ void _paragraphTests() { ..weight = canvasKit.FontWeight.Bold) ..fontSize = 72 ..heightMultiplier = 1.5 - ..halfLeading = false + ..halfLeading = true ..leading = 0 ..strutEnabled = true ..forceStrutHeight = false; From 8a659795af7d8b9051e9e6ab8b1dc84e1a1c583c Mon Sep 17 00:00:00 2001 From: LongCat is Looong <31859944+LongCatIsLooong@users.noreply.github.com> Date: Thu, 15 Feb 2024 15:32:41 -0800 Subject: [PATCH 2/2] Turn struct halfleading in canvaskit kitchensink test back on --- lib/web_ui/test/canvaskit/canvaskit_api_test.dart | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/web_ui/test/canvaskit/canvaskit_api_test.dart b/lib/web_ui/test/canvaskit/canvaskit_api_test.dart index 6a1fea063ef34..e737caf4b4a7b 100644 --- a/lib/web_ui/test/canvaskit/canvaskit_api_test.dart +++ b/lib/web_ui/test/canvaskit/canvaskit_api_test.dart @@ -1596,7 +1596,7 @@ void _paragraphTests() { ..weight = canvasKit.FontWeight.Bold) ..fontSize = 72 ..heightMultiplier = 1.5 - ..halfLeading = false + ..halfLeading = true ..leading = 0 ..strutEnabled = true ..forceStrutHeight = false; @@ -1673,7 +1673,7 @@ void _paragraphTests() { expect(actual, within(distance: actual / 100, from: expected)); } - expectAlmost(paragraph.getAlphabeticBaseline(), 85.5); + expectAlmost(paragraph.getAlphabeticBaseline(), 78.6); expect(paragraph.didExceedMaxLines(), isFalse); expectAlmost(paragraph.getHeight(), 108); expectAlmost(paragraph.getIdeographicBaseline(), 108); @@ -1699,7 +1699,7 @@ void _paragraphTests() { expectAlmost(lineMetrics.ascent, 55.6); expectAlmost(lineMetrics.descent, 14.8); expect(lineMetrics.isHardBreak, isTrue); - expectAlmost(lineMetrics.baseline, 85.5); + expectAlmost(lineMetrics.baseline, 78.6); expectAlmost(lineMetrics.height, 108); expectAlmost(lineMetrics.left, 2.5); expectAlmost(lineMetrics.width, 263);