AtlasAutocode
Committed by David PHAM-VAN

Fix TextStyle merge decoration

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