more tests

Author: LongCatIsLooong

testing/dart/text_test.dart

@@ -54,6 +54,10 @@ void main() {
     const TextHeightBehavior behavior3 = TextHeightBehavior(
       applyHeightToLastDescent: false
     );
+    const TextHeightBehavior behavior4 = TextHeightBehavior(
+      applyHeightToLastDescent: false,
+      leadingDistribution: LeadingDistribution.even,
+    );
 
     test('default constructor works', () {
       expect(behavior0.applyHeightToFirstAscent, equals(true));
@@ -67,27 +71,33 @@ void main() {
 
       expect(behavior3.applyHeightToFirstAscent, equals(true));
       expect(behavior3.applyHeightToLastDescent, equals(false));
+
+      expect(behavior4.applyHeightToLastDescent, equals(false));
+      expect(behavior4.leadingDistribution, equals(LeadingDistribution.even));
     });
 
     test('encode works', () {
       expect(behavior0.encode(), equals(0));
       expect(behavior1.encode(), equals(3));
       expect(behavior2.encode(), equals(1));
       expect(behavior3.encode(), equals(2));
+      expect(behavior4.encode(), equals(5));
     });
 
     test('decode works', () {
       expect(TextHeightBehavior.fromEncoded(0), equals(behavior0));
       expect(TextHeightBehavior.fromEncoded(3), equals(behavior1));
       expect(TextHeightBehavior.fromEncoded(1), equals(behavior2));
       expect(TextHeightBehavior.fromEncoded(2), equals(behavior3));
+      expect(TextHeightBehavior.fromEncoded(5), equals(behavior4));
     });
 
     test('toString works', () {
       expect(behavior0.toString(), equals('TextHeightBehavior(applyHeightToFirstAscent: true, applyHeightToLastDescent: true, leadingDistribution: LeadingDistribution.proportional)'));
       expect(behavior1.toString(), equals('TextHeightBehavior(applyHeightToFirstAscent: false, applyHeightToLastDescent: false, leadingDistribution: LeadingDistribution.proportional)'));
       expect(behavior2.toString(), equals('TextHeightBehavior(applyHeightToFirstAscent: false, applyHeightToLastDescent: true, leadingDistribution: LeadingDistribution.proportional)'));
       expect(behavior3.toString(), equals('TextHeightBehavior(applyHeightToFirstAscent: true, applyHeightToLastDescent: false, leadingDistribution: LeadingDistribution.proportional)'));
+      expect(behavior4.toString(), equals('TextHeightBehavior(applyHeightToFirstAscent: true, applyHeightToLastDescent: false, leadingDistribution: LeadingDistribution.even)'));
     });
   });
 

third_party/txt/tests/paragraph_unittests.cc

@@ -7045,4 +7045,64 @@ TEST_F(ParagraphTest, TextHeightBehaviorRectsParagraph) {
   ASSERT_TRUE(Snapshot());
 }
 
+TEST_F(ParagraphTest, MixedTextHeightBehaviorRectsParagraph) {
+  const char* text = "0123456789";
+  auto icu_text = icu::UnicodeString::fromUTF8(text);
+  std::u16string u16_text(icu_text.getBuffer(),
+                          icu_text.getBuffer() + icu_text.length());
+
+  txt::ParagraphStyle paragraph_style;
+  // paragraph_style.text_height_behavior will be overridden later.
+  paragraph_style.text_height_behavior =
+      txt::TextHeightBehavior::kDisableFirstAscent |
+      txt::TextHeightBehavior::kDisableLastDescent;
+
+  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
+
+  txt::TextStyle text_style;
+  text_style.color = SK_ColorBLACK;
+  text_style.font_families = std::vector<std::string>(1, "Roboto");
+  text_style.font_size = 30;
+  text_style.height = 5;
+  text_style.has_height_override = true;
+  text_style.has_text_height_behavior_override = true;
+  text_style.text_height_behavior = txt::TextHeightBehavior::kDisableAll |
+                                    txt::TextHeightBehavior::kHalfLeading;
+  builder.PushStyle(text_style);
+  builder.AddText(u16_text);
+
+  text_style.text_height_behavior = txt::TextHeightBehavior::kHalfLeading;
+  builder.PushStyle(text_style);
+  builder.AddText(u16_text);
+
+  builder.Pop();
+
+  auto paragraph = BuildParagraph(builder);
+  paragraph->Layout(GetTestCanvasWidth() - 300);
+
+  paragraph->Paint(GetCanvas(), 0, 0);
+
+  SkPaint paint;
+  paint.setStyle(SkPaint::kStroke_Style);
+  paint.setAntiAlias(true);
+  paint.setStrokeWidth(1);
+
+  // Tests for GetRectsForRange()
+  Paragraph::RectHeightStyle rect_height_style =
+      Paragraph::RectHeightStyle::kMax;
+  Paragraph::RectWidthStyle rect_width_style =
+      Paragraph::RectWidthStyle::kTight;
+  paint.setColor(SK_ColorRED);
+  std::vector<txt::Paragraph::TextBox> boxes =
+      paragraph->GetRectsForRange(0, 20, rect_height_style, rect_width_style);
+
+  for (size_t i = 0; i < boxes.size(); ++i) {
+    GetCanvas()->drawRect(boxes[i].rect, paint);
+  }
+  // The line-height is the same as not having the kDisableAll flag.
+  EXPECT_GT(boxes.size(), 1ull);
+  EXPECT_FLOAT_EQ(boxes[0].rect.bottom() - boxes[0].rect.top(), 150.0);
+
+  ASSERT_TRUE(Snapshot());
+}
 }  // namespace txt