DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove an obsolete workaround for Blink's calculation of baselines (#16966)

Browse Source
This commit is contained in:
Jason Simmons 2018-04-25 14:24:07 -07:00 committed by GitHub
parent 7038597b02
commit e06f69e1cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
packages/flutter/lib/src/painting/text_painter.dart
View File

@ -300,29 +300,6 @@ class TextPainter {
return new Size(width, height);
}
// Workaround for https://github.com/flutter/flutter/issues/13303
double _workaroundBaselineBug(double value, TextBaseline baseline) {
if (value >= 0.0)
return value;
final ui.ParagraphBuilder builder = new ui.ParagraphBuilder(
_createParagraphStyle(TextDirection.ltr),
);
if (text?.style != null)
builder.pushStyle(text.style.getTextStyle(textScaleFactor: textScaleFactor));
builder.addText(_kZeroWidthSpace);
final ui.Paragraph paragraph = builder.build()
..layout(new ui.ParagraphConstraints(width: double.infinity));
switch (baseline) {
case TextBaseline.alphabetic:
return paragraph.alphabeticBaseline;
case TextBaseline.ideographic:
return paragraph.ideographicBaseline;
}
return null;
}
/// Returns the distance from the top of the text to the first baseline of the
/// given type.
///
@ -332,9 +309,9 @@ class TextPainter {
assert(baseline != null);
switch (baseline) {
case TextBaseline.alphabetic:
return _workaroundBaselineBug(_paragraph.alphabeticBaseline, baseline);
return _paragraph.alphabeticBaseline;
case TextBaseline.ideographic:
return _workaroundBaselineBug(_paragraph.ideographicBaseline, baseline);
return _paragraph.ideographicBaseline;
}
return null;
}