Improve TextStyle decoration merging

@@ -7,6 +7,7 @@
 - Add LinearProgressIndicator
 - Add LinearProgressIndicator
 - Add PdfOutline.toString()
 - Add PdfOutline.toString()
 - Add equality operator to PdfPageFormat
 - Add equality operator to PdfPageFormat
+- Improve TextStyle decoration merging
 
 
 ## 3.3.0
 ## 3.3.0
 
 

@@ -43,11 +43,6 @@ class TextDecoration {
 
 
   final int _mask;
   final int _mask;
 
 
-  /// Whether this decoration will paint at least as much decoration as the given decoration.
-  bool contains(TextDecoration other) {
-    return (_mask | other._mask) == _mask;
-  }
-
   /// Do not draw a decoration
   /// Do not draw a decoration
   static const TextDecoration none = TextDecoration._(0x0);
   static const TextDecoration none = TextDecoration._(0x0);
 
 
@@ -60,6 +55,18 @@ class TextDecoration {
   /// Draw a line through each line of text
   /// Draw a line through each line of text
   static const TextDecoration lineThrough = TextDecoration._(0x4);
   static const TextDecoration lineThrough = TextDecoration._(0x4);
 
 
+  TextDecoration merge(TextDecoration? other) {
+    if (other == null) {
+      return this;
+    }
+    return TextDecoration._(_mask | other._mask);
+  }
+
+  /// Whether this decoration will paint at least as much decoration as the given decoration.
+  bool contains(TextDecoration other) {
+    return (_mask | other._mask) == _mask;
+  }
+
   @override
   @override
   bool operator ==(dynamic other) {
   bool operator ==(dynamic other) {
     if (other is! TextDecoration) {
     if (other is! TextDecoration) {
@@ -340,7 +347,7 @@ class TextStyle {
       lineSpacing: other.lineSpacing,
       lineSpacing: other.lineSpacing,
       height: other.height,
       height: other.height,
       background: other.background,
       background: other.background,
-      decoration: other.decoration,
+      decoration: decoration?.merge(other.decoration),
       decorationColor: other.decorationColor,
       decorationColor: other.decorationColor,
       decorationStyle: other.decorationStyle,
       decorationStyle: other.decorationStyle,
       decorationThickness: other.decorationThickness,
       decorationThickness: other.decorationThickness,