Merge pull request #326 from IIzzaya/master

[Fix] Gradient Text Support

Author: zhuxingwei

Runtime/painting/text_style.cs

@@ -78,6 +78,7 @@ public TextStyle(bool inherit = true,
             this.fontFamily = fontFamily;
             this._fontFamilyFallback = fontFamilyFallback;
             this.debugLabel = debugLabel;
+            this.foreground = foreground;
             this.background = background;
         }
 
@@ -264,6 +265,7 @@ public TextStyle copyWith(
                 decorationColor: decorationColor ?? this.decorationColor,
                 decorationStyle: decorationStyle ?? this.decorationStyle,
                 decorationThickness: decorationThickness ?? this.decorationThickness,
+                foreground: foreground ?? this.foreground,
                 background: background ?? this.background,
                 debugLabel: newDebugLabel
             );

Runtime/ui/text.cs

@@ -97,6 +97,7 @@ class TextStyle : IEquatable<TextStyle> {
         public readonly Color decorationColor;
         public readonly TextDecorationStyle decorationStyle = kDefaultDecorationStyle;
         public readonly string fontFamily = kDefaultFontFamily;
+        public readonly Paint foreground;
         public readonly Paint background;
 
         internal UnityEngine.Color UnityColor {
@@ -140,6 +141,7 @@ public static TextStyle applyStyle(TextStyle currentStyle, painting.TextStyle st
                     decoration: style.decoration ?? currentStyle.decoration,
                     decorationColor: style.decorationColor ?? currentStyle.decorationColor,
                     fontFamily: style.fontFamily ?? currentStyle.fontFamily,
+                    foreground: style.foreground ?? currentStyle.foreground,
                     background: style.background ?? currentStyle.background
                 );
             }
@@ -156,6 +158,7 @@ public static TextStyle applyStyle(TextStyle currentStyle, painting.TextStyle st
                 decoration: style.decoration,
                 decorationColor: style.decorationColor,
                 fontFamily: style.fontFamily,
+                foreground: style.foreground,
                 background: style.background
             );
         }
@@ -227,6 +230,7 @@ public TextStyle(Color color = null, float? fontSize = null,
             float? wordSpacing = null, TextBaseline? textBaseline = null, float? height = null,
             TextDecoration decoration = null, TextDecorationStyle? decorationStyle = null, Color decorationColor = null,
             string fontFamily = null,
+            Paint foreground = null,
             Paint background = null
         ) {
             this.color = color ?? this.color;
@@ -242,6 +246,7 @@ public TextStyle(Color color = null, float? fontSize = null,
             this.decorationStyle = decorationStyle ?? this.decorationStyle;
             this.decorationColor = decorationColor ?? this.decorationColor;
             this.fontFamily = fontFamily ?? this.fontFamily;
+            this.foreground = foreground ?? this.foreground;
             this.background = background ?? this.background;
         }
     }

Runtime/ui/txt/paragraph.cs

@@ -286,7 +286,11 @@ public void clear() {
             this._paragraphStyle = null;
         }
 
-        readonly Paint _textPaint = new Paint {
+        Paint _textPaint = new Paint {
+            filterMode = FilterMode.Bilinear
+        };
+
+        Paint _defaultPaint = new Paint {
             filterMode = FilterMode.Bilinear
         };
 
@@ -298,8 +302,17 @@ public void paint(Canvas canvas, Offset offset) {
 
             for (int i = 0; i < this._paintRecordsCount; i++) {
                 var paintRecord = this._paintRecords[i];
-                this._textPaint.color = paintRecord.style.color;
+                
+                if (paintRecord.style.foreground != null) {
+                    this._textPaint = paintRecord.style.foreground;
+                }
+                else {
+                    this._textPaint = this._defaultPaint;
+                    this._textPaint.color = paintRecord.style.color;
+                }
+
                 canvas.drawTextBlob(paintRecord.text, paintRecord.shiftedOffset(offset), this._textPaint);
+                
                 this.paintDecorations(canvas, paintRecord, offset);
             }
         }