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

[web] Reuse the existing font string builer in TextStyle (#22444)

Browse Source
This commit is contained in:
Mouad Debbar 2020-11-11 15:49:46 -08:00 committed by GitHub
parent f62b754e7f
commit 468bc3e9ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 56 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/web_ui/lib/src/engine/text/paragraph.dart
View File

@ -1021,6 +1021,20 @@ class EngineTextStyle implements ui.TextStyle {
return _fontFamily;
}
String? _cssFontString;
/// Font string to be used in CSS.
///
/// See <https://developer.mozilla.org/en-US/docs/Web/CSS/font>.
String get cssFontString {
return _cssFontString ??= _buildCssFontString(
fontStyle: _fontStyle,
fontWeight: _fontWeight,
fontSize: _fontSize,
fontFamily: _effectiveFontFamily,
);
}
@override
bool operator ==(Object other) {
if (identical(this, other)) {

72
lib/web_ui/lib/src/engine/text/ruler.dart
View File

@ -5,6 +5,41 @@
// @dart = 2.10
part of engine;
String _buildCssFontString({
required ui.FontStyle? fontStyle,
required ui.FontWeight? fontWeight,
required double? fontSize,
required String? fontFamily,
}) {
final StringBuffer result = StringBuffer();
// Font style
if (fontStyle != null) {
result.write(fontStyle == ui.FontStyle.normal ? 'normal' : 'italic');
} else {
result.write(DomRenderer.defaultFontStyle);
}
result.write(' ');
// Font weight.
if (fontWeight != null) {
result.write(fontWeightToCss(fontWeight));
} else {
result.write(DomRenderer.defaultFontWeight);
}
result.write(' ');
if (fontSize != null) {
result.write(fontSize.floor());
} else {
result.write(DomRenderer.defaultFontSize);
}
result.write('px ');
result.write(canonicalizeFontFamily(fontFamily));
return result.toString();
}
/// Contains the subset of [ui.ParagraphStyle] properties that affect layout.
class ParagraphGeometricStyle {
ParagraphGeometricStyle({
@ -65,36 +100,13 @@ class ParagraphGeometricStyle {
/// Cached font string that can be used in CSS.
///
/// See <https://developer.mozilla.org/en-US/docs/Web/CSS/font>.
String get cssFontString => _cssFontString ??= _buildCssFontString();
String _buildCssFontString() {
final StringBuffer result = StringBuffer();
// Font style
if (fontStyle != null) {
result.write(fontStyle == ui.FontStyle.normal ? 'normal' : 'italic');
} else {
result.write(DomRenderer.defaultFontStyle);
}
result.write(' ');
// Font weight.
if (fontWeight != null) {
result.write(fontWeightToCss(fontWeight));
} else {
result.write(DomRenderer.defaultFontWeight);
}
result.write(' ');
if (fontSize != null) {
result.write(fontSize!.floor());
} else {
result.write(DomRenderer.defaultFontSize);
}
result.write('px ');
result.write(canonicalizeFontFamily(effectiveFontFamily));
return result.toString();
String get cssFontString {
return _cssFontString ??= _buildCssFontString(
fontStyle: fontStyle,
fontWeight: fontWeight,
fontSize: fontSize,
fontFamily: effectiveFontFamily,
);
}
@override