Make sure to call setHeightOverride as well on TextStyle and StrutStyle (flutter#50920)

eyebrowsoffire · web-flow · commit a04fba4a23a9 · 2024-02-26T18:52:59.000Z
This fixes flutter#143877 We apparently need to call `setHeightOverride(true)` on `TextStyle` and `StrutStyle` objects in order to properly apply the height.
diff --git a/lib/web_ui/skwasm/text/strut_style.cpp b/lib/web_ui/skwasm/text/strut_style.cpp
@@ -33,6 +33,7 @@ SKWASM_EXPORT void strutStyle_setFontSize(StrutStyle* style,
 
 SKWASM_EXPORT void strutStyle_setHeight(StrutStyle* style, SkScalar height) {
   style->setHeight(height);
+  style->setHeightOverride(true);
 }
 
 SKWASM_EXPORT void strutStyle_setHalfLeading(StrutStyle* style,
diff --git a/lib/web_ui/skwasm/text/text_style.cpp b/lib/web_ui/skwasm/text/text_style.cpp
@@ -96,6 +96,7 @@ SKWASM_EXPORT void textStyle_setWordSpacing(TextStyle* style,
 
 SKWASM_EXPORT void textStyle_setHeight(TextStyle* style, SkScalar height) {
   style->setHeight(height);
+  style->setHeightOverride(true);
 }
 
 SKWASM_EXPORT void textStyle_setHalfLeading(TextStyle* style,
diff --git a/lib/web_ui/test/ui/text_golden_test.dart b/lib/web_ui/test/ui/text_golden_test.dart
@@ -68,6 +68,11 @@ Future<void> testMain() async {
         layoutWidth: 50, paragraphHeight: 1.5);
   });
 
+  test('text styles - text style height overriding paragraph height', () async {
+    await testTextStyle('text style height and paragraph style height',
+      layoutWidth: 50, paragraphHeight: 1.5, height: 2.0);
+  });
+
   test('text styles - paragraph text height behavior', () async {
     await testTextStyle('paragraph text height behavior',
         layoutWidth: 50,

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ SKWASM_EXPORT void strutStyle_setFontSize(StrutStyle* style,`
`33`	`33`
`34`	`34`	`SKWASM_EXPORT void strutStyle_setHeight(StrutStyle* style, SkScalar height) {`
`35`	`35`	`style->setHeight(height);`
	`36`	`+ style->setHeightOverride(true);`
`36`	`37`	`}`
`37`	`38`
`38`	`39`	`SKWASM_EXPORT void strutStyle_setHalfLeading(StrutStyle* style,`
Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,7 @@ SKWASM_EXPORT void textStyle_setWordSpacing(TextStyle* style,`
`96`	`96`
`97`	`97`	`SKWASM_EXPORT void textStyle_setHeight(TextStyle* style, SkScalar height) {`
`98`	`98`	`style->setHeight(height);`
	`99`	`+ style->setHeightOverride(true);`
`99`	`100`	`}`
`100`	`101`
`101`	`102`	`SKWASM_EXPORT void textStyle_setHalfLeading(TextStyle* style,`