review

LongCatIsLooong · LongCatIsLooong · commit 5b8818f9eb34 · 2021-04-28T12:58:24.000-07:00
diff --git a/lib/web_ui/lib/src/engine/canvaskit/text.dart b/lib/web_ui/lib/src/engine/canvaskit/text.dart
@@ -89,7 +89,8 @@ class CkParagraphStyle implements ui.ParagraphStyle {
       skStrutStyle.heightMultiplier = style._height;
     }
 
-    switch (style._leadingDistribution ?? paragraphHeightBehavior?.leadingDistribution) {
+    final ui.TextLeadingDistribution? effectiveLeadingDistribution = style._leadingDistribution ?? paragraphHeightBehavior?.leadingDistribution;
+    switch (effectiveLeadingDistribution) {
       case null:
         break;
       case ui.TextLeadingDistribution.even:
diff --git a/lib/web_ui/test/canvaskit/canvas_golden_test.dart b/lib/web_ui/test/canvaskit/canvas_golden_test.dart
@@ -368,7 +368,7 @@ void testMain() {
         ),
       );
       await testTextStyle(
-        'half leading',
+        'half leading overrides paragraph style half leading',
         height: 20,
         fontSize: 10,
         leadingDistribution: ui.TextLeadingDistribution.proportional,

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,8 @@ class CkParagraphStyle implements ui.ParagraphStyle {`
`89`	`89`	`skStrutStyle.heightMultiplier = style._height;`
`90`	`90`	`}`
`91`	`91`
`92`		`- switch (style._leadingDistribution ?? paragraphHeightBehavior?.leadingDistribution) {`
	`92`	`+ final ui.TextLeadingDistribution? effectiveLeadingDistribution = style._leadingDistribution ?? paragraphHeightBehavior?.leadingDistribution;`
	`93`	`+ switch (effectiveLeadingDistribution) {`
`93`	`94`	`case null:`
`94`	`95`	`break;`
`95`	`96`	`case ui.TextLeadingDistribution.even:`