Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Changes from all commits
Commits
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
13 changes: 9 additions & 4 deletions lib/web_ui/lib/src/engine/text/paragraph.dart
Original file line number Diff line number Diff line change
Expand Up @@ -755,15 +755,15 @@ class EngineTextStyle implements ui.TextStyle {
_decoration = decoration,
_decorationColor = decorationColor,
_decorationStyle = decorationStyle,
_decorationThickness = decorationThickness,
_fontWeight = fontWeight,
_fontStyle = fontStyle,
_textBaseline = textBaseline,
// TODO(b/128311960): when font fallback is supported, we should check
// for it here.
_isFontFamilyProvided = fontFamily != null,
_fontFamily = fontFamily ?? '',
// TODO(b/128311960): add support for font family fallback.
_fontFamilyFallback = fontFamilyFallback,
// TODO: https://github.com/flutter/flutter/issues/56707
_fontFeatures = fontFeatures,
_fontSize = fontSize,
_letterSpacing = letterSpacing,
_wordSpacing = wordSpacing,
Expand All @@ -777,12 +777,14 @@ class EngineTextStyle implements ui.TextStyle {
final ui.TextDecoration _decoration;
final ui.Color _decorationColor;
final ui.TextDecorationStyle _decorationStyle;
final double _decorationThickness;
final ui.FontWeight _fontWeight;
final ui.FontStyle _fontStyle;
final ui.TextBaseline _textBaseline;
final bool _isFontFamilyProvided;
final String _fontFamily;
final List<String> _fontFamilyFallback;
final List<ui.FontFeature> _fontFeatures;
final double _fontSize;
final double _letterSpacing;
final double _wordSpacing;
Expand Down Expand Up @@ -841,6 +843,7 @@ class EngineTextStyle implements ui.TextStyle {
_decoration,
_decorationColor,
_decorationStyle,
_decorationThickness,
_fontWeight,
_fontStyle,
_textBaseline,
Expand All @@ -864,6 +867,7 @@ class EngineTextStyle implements ui.TextStyle {
'decoration: ${_decoration ?? "unspecified"}, '
'decorationColor: ${_decorationColor ?? "unspecified"}, '
'decorationStyle: ${_decorationStyle ?? "unspecified"}, '
'decorationThickness: ${_decorationThickness ?? "unspecified"}, '
'fontWeight: ${_fontWeight ?? "unspecified"}, '
'fontStyle: ${_fontStyle ?? "unspecified"}, '
'textBaseline: ${_textBaseline ?? "unspecified"}, '
Expand All @@ -876,7 +880,8 @@ class EngineTextStyle implements ui.TextStyle {
'locale: ${_locale ?? "unspecified"}, '
'background: ${_background ?? "unspecified"}, '
'foreground: ${_foreground ?? "unspecified"}, '
'shadows: ${_shadows ?? "unspecified"}'
'shadows: ${_shadows ?? "unspecified"}, '
'fontFeatures: ${_fontFeatures ?? "unspecified"}'
')';
} else {
return super.toString();
Expand Down