AtlasAutocode
Committed by David PHAM-VAN

Fix TextStyle merge decoration

... ... @@ -355,7 +355,7 @@ class TextStyle {
lineSpacing: other.lineSpacing,
height: other.height,
background: other.background,
decoration: decoration?.merge(other.decoration),
decoration: decoration==null ? other.decoration : decoration!.merge(other.decoration),
decorationColor: other.decorationColor,
decorationStyle: other.decorationStyle,
decorationThickness: other.decorationThickness,
... ...