Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Allow unsetting TextStyle.height #52940

Merged
auto-submit merged 11 commits into from
May 24, 2024
Merged

Allow unsetting TextStyle.height #52940

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7d2406e
wip
LongCatIsLooong May 20, 2024
1519006
Merge remote-tracking branch 'upstream/main' into textStyle.height
LongCatIsLooong May 21, 2024
e4188c6
add test
LongCatIsLooong May 22, 2024
e8e51ac
canvaskit tests
LongCatIsLooong May 22, 2024
2b09b49
tests
LongCatIsLooong May 22, 2024
b6f173e
Merge branch 'main' into textStyle.height
LongCatIsLooong May 22, 2024
0115fb6
move tests
LongCatIsLooong May 23, 2024
bd75ba3
Merge remote-tracking branch 'origin/textStyle.height' into textStyle…
LongCatIsLooong May 23, 2024
7045198
whoops
LongCatIsLooong May 23, 2024
aef01f2
specify font name
LongCatIsLooong May 23, 2024
d2a6644
fix test
LongCatIsLooong May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
whoops
  • Loading branch information
@LongCatIsLooong
LongCatIsLooong committed May 23, 2024
commit 70451987c151ce9f665743f429d8929c6370cf2d
26 changes: 13 additions & 13 deletions lib/web_ui/test/ui/paragraph_builder_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,36 +85,36 @@ Future<void> testMain() async {
test('kTextHeightNone unsets the height multiplier', () {
const double fontSize = 10;
const String text = 'A';
final ui.ParagraphBuilder builder = ui.ParagraphBuilder(ui.ParagraphStyle(fontSize: fontSize, height: 10));
builder.pushStyle(ui.TextStyle(height: ui.kTextHeightNone));
final ParagraphBuilder builder = ParagraphBuilder(ParagraphStyle(fontSize: fontSize, height: 10));
builder.pushStyle(TextStyle(height: kTextHeightNone));
builder.addText(text);
final ui.Paragraph paragraph = builder.build()
..layout(const ui.ParagraphConstraints(width: 1000));
final Paragraph paragraph = builder.build()
..layout(const ParagraphConstraints(width: 1000));
expect(paragraph.height, fontSize);
});

test('kTextHeightNone ParagraphStyle', () {
const double fontSize = 10;
final ui.ParagraphBuilder builder = ui.ParagraphBuilder(
ui.ParagraphStyle(fontSize: fontSize, height: ui.kTextHeightNone),
final ParagraphBuilder builder = ParagraphBuilder(
ParagraphStyle(fontSize: fontSize, height: kTextHeightNone),
);
builder.addText('A');
final ui.Paragraph paragraph = builder.build()
..layout(const ui.ParagraphConstraints(width: 1000));
final Paragraph paragraph = builder.build()
..layout(const ParagraphConstraints(width: 1000));
expect(paragraph.height, fontSize);
});

test('kTextHeightNone StrutStyle', () {
const double fontSize = 10;
final ui.ParagraphBuilder builder = ui.ParagraphBuilder(
ui.ParagraphStyle(
final ParagraphBuilder builder = ParagraphBuilder(
ParagraphStyle(
fontSize: 100,
strutStyle: ui.StrutStyle(forceStrutHeight: true, height: ui.kTextHeightNone, fontSize: fontSize),
strutStyle: StrutStyle(forceStrutHeight: true, height: kTextHeightNone, fontSize: fontSize),
),
);
builder.addText('A');
final ui.Paragraph paragraph = builder.build()
..layout(const ui.ParagraphConstraints(width: 1000));
final Paragraph paragraph = builder.build()
..layout(const ParagraphConstraints(width: 1000));
expect(paragraph.height, fontSize);
});
}