From e6d6a15c5ffb4e1e050dff5dd97574031715ca9c Mon Sep 17 00:00:00 2001 From: ferhatb Date: Fri, 8 May 2020 11:41:48 -0700 Subject: [PATCH] Add fontFeatures and decorationThickness to textstyle --- lib/web_ui/lib/src/engine/text/paragraph.dart | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/web_ui/lib/src/engine/text/paragraph.dart b/lib/web_ui/lib/src/engine/text/paragraph.dart index 6b28d0609fecc..cefa402879080 100644 --- a/lib/web_ui/lib/src/engine/text/paragraph.dart +++ b/lib/web_ui/lib/src/engine/text/paragraph.dart @@ -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, @@ -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 _fontFamilyFallback; + final List _fontFeatures; final double _fontSize; final double _letterSpacing; final double _wordSpacing; @@ -841,6 +843,7 @@ class EngineTextStyle implements ui.TextStyle { _decoration, _decorationColor, _decorationStyle, + _decorationThickness, _fontWeight, _fontStyle, _textBaseline, @@ -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"}, ' @@ -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();