[1.5.4] Upgrade widgets. Add visible to TextOverflow.

Author: Yuncong Zhang

Runtime/rendering/paragraph.cs

@@ -20,6 +20,9 @@ public enum TextOverflow {
 
         /// Use an ellipsis to indicate that the text has overflowed.
         ellipsis,
+        
+        /// Render overflowing text outside of its container.
+        visible,
     }
 
 
@@ -30,7 +33,7 @@ public class RenderParagraph : RenderBox {
 
         TextOverflow _overflow;
         readonly TextPainter _textPainter;
-        bool _hasVisualOverflow = false;
+        bool _needsClipping = false;
 
         List<TextBox> _selectionRects;
 
@@ -405,11 +408,27 @@ public override void handleEvent(PointerEvent evt, HitTestEntry entry) {
         protected override void performLayout() {
             this._layoutTextWithConstraints(this.constraints);
             var textSize = this._textPainter.size;
-            var didOverflowHeight = this._textPainter.didExceedMaxLines;
+            var textDidExceedMaxLines = this._textPainter.didExceedMaxLines;
             this.size = this.constraints.constrain(textSize);
 
+            var didOverflowHeight = this.size.height < textSize.height || textDidExceedMaxLines;
             var didOverflowWidth = this.size.width < textSize.width;
-            this._hasVisualOverflow = didOverflowWidth || didOverflowHeight;
+            var hasVisualOverflow = didOverflowWidth || didOverflowHeight;
+            if (hasVisualOverflow) {
+                switch (this._overflow) {
+                case TextOverflow.visible:
+                    this._needsClipping = false;
+                    break;
+                case TextOverflow.clip:
+                case TextOverflow.ellipsis:
+                case TextOverflow.fade:
+                    this._needsClipping = true;
+                    break;
+                }
+            }
+            else {
+                this._needsClipping = false;
+            }
 
             this._selectionRects = null;
         }
@@ -419,7 +438,7 @@ void paintParagraph(PaintingContext context, Offset offset) {
             this._layoutTextWithConstraints(this.constraints);
             var canvas = context.canvas;
 
-            if (this._hasVisualOverflow) {
+            if (this._needsClipping) {
                 var bounds = offset & this.size;
                 canvas.save();
                 canvas.clipRect(bounds);
@@ -434,7 +453,7 @@ void paintParagraph(PaintingContext context, Offset offset) {
             }
 
             this._textPainter.paint(canvas, offset);
-            if (this._hasVisualOverflow) {
+            if (this._needsClipping) {
                 canvas.restore();
             }
         }

Runtime/widgets/fade_in_image.cs

@@ -101,11 +101,11 @@ public static FadeInImage assetNetwork(
         ) {
             D.assert(placeholder != null);
             D.assert(image != null);
-            D.assert(fadeOutDuration != null);
-            D.assert(fadeOutCurve != null);
-            D.assert(fadeInDuration != null);
-            D.assert(fadeInCurve != null);
-            D.assert(alignment != null);
+            fadeOutDuration = fadeOutDuration ?? new TimeSpan(0, 0, 0, 0, 300);
+            fadeOutCurve = fadeOutCurve ?? Curves.easeOut;
+            fadeInDuration = fadeInDuration ?? new TimeSpan(0, 0, 0, 0, 700);
+            fadeInCurve = Curves.easeIn;
+            alignment = alignment ?? Alignment.center;
             var imageProvider = placeholderScale != null
                 ? new ExactAssetImage(placeholder, bundle: bundle, scale: placeholderScale ?? 1.0f)
                 : (ImageProvider) new AssetImage(placeholder, bundle: bundle);

Runtime/widgets/icon.cs

@@ -1,5 +1,6 @@
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.painting;
+using Unity.UIWidgets.rendering;
 using Unity.UIWidgets.ui;
 using TextStyle = Unity.UIWidgets.painting.TextStyle;
 
@@ -36,6 +37,7 @@ public override Widget build(BuildContext context) {
             }
 
             Widget iconWidget = new RichText(
+                overflow: TextOverflow.visible,
                 text: new TextSpan(
                     text: new string(new[] {(char) this.icon.codePoint}),
                     style: new TextStyle(

Runtime/widgets/nested_scroll_view.cs

@@ -25,7 +25,7 @@ public NestedScrollView(
             ScrollPhysics physics = null,
             NestedScrollViewHeaderSliversBuilder headerSliverBuilder = null,
             Widget body = null,
-            DragStartBehavior dragStartBehavior = DragStartBehavior.down
+            DragStartBehavior dragStartBehavior = DragStartBehavior.start
         ) : base(key: key) {
             D.assert(headerSliverBuilder != null);
             D.assert(body != null);
@@ -157,7 +157,7 @@ public _NestedScrollViewCustomScrollView(
             ScrollController controller,
             List<Widget> slivers,
             SliverOverlapAbsorberHandle handle,
-            DragStartBehavior dragStartBehavior = DragStartBehavior.down
+            DragStartBehavior dragStartBehavior = DragStartBehavior.start
         ) : base(
             scrollDirection: scrollDirection,
             reverse: reverse,

Tests/Editor/Paragraph.cs

@@ -68,16 +68,15 @@ RenderBox none() {
             return null;
         }
 
-        RenderBox box(RenderParagraph p, int width = 200, int height = 200) {
+        RenderBox box(RenderParagraph p, int width = 200, int height = 600) {
             return new RenderConstrainedOverflowBox(
                     minWidth: width,
                     maxWidth: width,
                     minHeight: height,
                     maxHeight: height,
                     alignment: Alignment.center,
                     child: p
-                )
-                ;
+                );
         }
 
         RenderBox flexItemBox(RenderParagraph p, int width = 200, int height = 150) {