From ce8ba6e8b32cf2f11291c2da1b0807c3c1fe6a44 Mon Sep 17 00:00:00 2001 From: liyuqian Date: Thu, 23 Aug 2018 18:05:11 -0700 Subject: [PATCH] Set the default clip to Clip.none again. (#20752) This reverts commit 8de0e15e4fdd3a1be8878394a7f8c8bda948e59b and updates the goldens versoin. This requires https://github.com/flutter/flutter/pull/20751 to land first. --- bin/internal/goldens.version | 2 +- packages/flutter/lib/src/material/button.dart | 5 ++--- packages/flutter/lib/src/material/material.dart | 6 ++---- packages/flutter/lib/src/material/outline_button.dart | 6 ++---- packages/flutter/lib/src/material/raised_button.dart | 6 ++---- packages/flutter/lib/src/rendering/layer.dart | 4 ++-- packages/flutter/lib/src/rendering/proxy_box.dart | 8 ++++---- packages/flutter/lib/src/widgets/basic.dart | 6 +++--- packages/flutter/lib/src/widgets/implicit_animations.dart | 4 +--- packages/flutter/test/material/buttons_test.dart | 2 +- packages/flutter/test/material/material_test.dart | 2 +- packages/flutter/test/material/outline_button_test.dart | 2 +- packages/flutter/test/widgets/clip_test.dart | 4 ++-- 13 files changed, 24 insertions(+), 33 deletions(-) diff --git a/bin/internal/goldens.version b/bin/internal/goldens.version index f756bbed28..a216507317 100644 --- a/bin/internal/goldens.version +++ b/bin/internal/goldens.version @@ -1 +1 @@ -cc98e28c974eea0bd9a8e24591857ae6b5479795 +1a999092d10a22bc700214b257cd4890c5800078 diff --git a/packages/flutter/lib/src/material/button.dart b/packages/flutter/lib/src/material/button.dart index bf6c743b40..f9f01d4a9f 100644 --- a/packages/flutter/lib/src/material/button.dart +++ b/packages/flutter/lib/src/material/button.dart @@ -3,7 +3,6 @@ // found in the LICENSE file. import 'dart:math' as math; -import 'dart:ui'as ui show defaultClipBehavior; // ignore: deprecated_member_use import 'package:flutter/foundation.dart'; import 'package:flutter/rendering.dart'; @@ -47,7 +46,7 @@ class RawMaterialButton extends StatefulWidget { this.constraints = const BoxConstraints(minWidth: 88.0, minHeight: 36.0), this.shape = const RoundedRectangleBorder(), this.animationDuration = kThemeChangeDuration, - this.clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use, + this.clipBehavior = Clip.none, MaterialTapTargetSize materialTapTargetSize, this.child, }) : this.materialTapTargetSize = materialTapTargetSize ?? MaterialTapTargetSize.padded, @@ -269,7 +268,7 @@ class MaterialButton extends StatelessWidget { this.height, this.padding, this.materialTapTargetSize, - this.clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use, + this.clipBehavior = Clip.none, @required this.onPressed, this.child }) : assert(clipBehavior != null), super(key: key); diff --git a/packages/flutter/lib/src/material/material.dart b/packages/flutter/lib/src/material/material.dart index 199c085c3e..dc06f8e9ec 100644 --- a/packages/flutter/lib/src/material/material.dart +++ b/packages/flutter/lib/src/material/material.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'dart:ui'as ui show defaultClipBehavior; // ignore: deprecated_member_use - import 'package:flutter/foundation.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter/widgets.dart'; @@ -174,7 +172,7 @@ class Material extends StatefulWidget { this.textStyle, this.borderRadius, this.shape, - this.clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use + this.clipBehavior = Clip.none, this.animationDuration = kThemeChangeDuration, this.child, }) : assert(type != null), @@ -600,7 +598,7 @@ class _MaterialInterior extends ImplicitlyAnimatedWidget { Key key, @required this.child, @required this.shape, - this.clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use + this.clipBehavior = Clip.none, @required this.elevation, @required this.color, @required this.shadowColor, diff --git a/packages/flutter/lib/src/material/outline_button.dart b/packages/flutter/lib/src/material/outline_button.dart index eb04f9ab86..d57a66f9df 100644 --- a/packages/flutter/lib/src/material/outline_button.dart +++ b/packages/flutter/lib/src/material/outline_button.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'dart:ui' as ui show defaultClipBehavior; // ignore: deprecated_member_use - import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; @@ -70,7 +68,7 @@ class OutlineButton extends StatefulWidget { this.highlightedBorderColor, this.padding, this.shape, - this.clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use, + this.clipBehavior = Clip.none, this.child, }) : assert(highlightElevation != null && highlightElevation >= 0.0), assert(clipBehavior != null), @@ -98,7 +96,7 @@ class OutlineButton extends StatefulWidget { this.disabledBorderColor, this.highlightedBorderColor, this.shape, - this.clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use, + this.clipBehavior = Clip.none, @required Widget icon, @required Widget label, }) : assert(highlightElevation != null && highlightElevation >= 0.0), diff --git a/packages/flutter/lib/src/material/raised_button.dart b/packages/flutter/lib/src/material/raised_button.dart index c76b03edbe..7b06c05183 100644 --- a/packages/flutter/lib/src/material/raised_button.dart +++ b/packages/flutter/lib/src/material/raised_button.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'dart:ui' as ui show defaultClipBehavior; // ignore: deprecated_member_use - import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; @@ -65,7 +63,7 @@ class RaisedButton extends StatelessWidget { this.disabledElevation = 0.0, this.padding, this.shape, - this.clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use + this.clipBehavior = Clip.none, this.materialTapTargetSize, this.animationDuration = kThemeChangeDuration, this.child, @@ -100,7 +98,7 @@ class RaisedButton extends StatelessWidget { this.highlightElevation = 8.0, this.disabledElevation = 0.0, this.shape, - this.clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use + this.clipBehavior = Clip.none, this.materialTapTargetSize, this.animationDuration = kThemeChangeDuration, @required Widget icon, diff --git a/packages/flutter/lib/src/rendering/layer.dart b/packages/flutter/lib/src/rendering/layer.dart index 97d1ad2dca..f2db334aac 100644 --- a/packages/flutter/lib/src/rendering/layer.dart +++ b/packages/flutter/lib/src/rendering/layer.dart @@ -4,7 +4,7 @@ import 'dart:async'; import 'dart:collection'; -import 'dart:ui' as ui show Image, ImageFilter, Picture, Scene, SceneBuilder, defaultClipBehavior; // ignore: deprecated_member_use +import 'dart:ui' as ui show Image, ImageFilter, Picture, Scene, SceneBuilder; import 'package:flutter/foundation.dart'; import 'package:flutter/painting.dart'; @@ -970,7 +970,7 @@ class PhysicalModelLayer extends ContainerLayer { /// The [clipPath], [elevation], and [color] arguments must not be null. PhysicalModelLayer({ @required this.clipPath, - this.clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use + this.clipBehavior = Clip.none, @required this.elevation, @required this.color, @required this.shadowColor, diff --git a/packages/flutter/lib/src/rendering/proxy_box.dart b/packages/flutter/lib/src/rendering/proxy_box.dart index 78f3edaa95..086f2a37f4 100644 --- a/packages/flutter/lib/src/rendering/proxy_box.dart +++ b/packages/flutter/lib/src/rendering/proxy_box.dart @@ -4,7 +4,7 @@ import 'dart:async'; -import 'dart:ui' as ui show ImageFilter, Gradient, Image, defaultClipBehavior; // ignore: deprecated_member_use +import 'dart:ui' as ui show ImageFilter, Gradient, Image; import 'package:flutter/animation.dart'; import 'package:flutter/foundation.dart'; @@ -1500,7 +1500,7 @@ abstract class _RenderPhysicalModelBase extends _RenderCustomClip { @required double elevation, @required Color color, @required Color shadowColor, - Clip clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use, + Clip clipBehavior = Clip.none, CustomClipper clipper, }) : assert(elevation != null), assert(color != null), @@ -1579,7 +1579,7 @@ class RenderPhysicalModel extends _RenderPhysicalModelBase { RenderPhysicalModel({ RenderBox child, BoxShape shape = BoxShape.rectangle, - Clip clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use, + Clip clipBehavior = Clip.none, BorderRadius borderRadius, double elevation = 0.0, @required Color color, @@ -1738,7 +1738,7 @@ class RenderPhysicalShape extends _RenderPhysicalModelBase { RenderPhysicalShape({ RenderBox child, @required CustomClipper clipper, - Clip clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use, + Clip clipBehavior = Clip.none, double elevation = 0.0, @required Color color, Color shadowColor = const Color(0xFF000000), diff --git a/packages/flutter/lib/src/widgets/basic.dart b/packages/flutter/lib/src/widgets/basic.dart index 8e57eb28ad..3c772a0dc9 100644 --- a/packages/flutter/lib/src/widgets/basic.dart +++ b/packages/flutter/lib/src/widgets/basic.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'dart:ui' as ui show Image, ImageFilter, defaultClipBehavior; // ignore: deprecated_member_use +import 'dart:ui' as ui show Image, ImageFilter; import 'package:flutter/foundation.dart'; import 'package:flutter/rendering.dart'; @@ -711,7 +711,7 @@ class PhysicalModel extends SingleChildRenderObjectWidget { const PhysicalModel({ Key key, this.shape = BoxShape.rectangle, - this.clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use, + this.clipBehavior = Clip.none, this.borderRadius, this.elevation = 0.0, @required this.color, @@ -799,7 +799,7 @@ class PhysicalShape extends SingleChildRenderObjectWidget { const PhysicalShape({ Key key, @required this.clipper, - this.clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use, + this.clipBehavior = Clip.none, this.elevation = 0.0, @required this.color, this.shadowColor = const Color(0xFF000000), diff --git a/packages/flutter/lib/src/widgets/implicit_animations.dart b/packages/flutter/lib/src/widgets/implicit_animations.dart index 5c977fb363..67eb0fc831 100644 --- a/packages/flutter/lib/src/widgets/implicit_animations.dart +++ b/packages/flutter/lib/src/widgets/implicit_animations.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'dart:ui'as ui show defaultClipBehavior; // ignore: deprecated_member_use - import 'package:flutter/animation.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/rendering.dart'; @@ -1183,7 +1181,7 @@ class AnimatedPhysicalModel extends ImplicitlyAnimatedWidget { Key key, @required this.child, @required this.shape, - this.clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use, + this.clipBehavior = Clip.none, this.borderRadius = BorderRadius.zero, @required this.elevation, @required this.color, diff --git a/packages/flutter/test/material/buttons_test.dart b/packages/flutter/test/material/buttons_test.dart index 627977690f..7209d48d71 100644 --- a/packages/flutter/test/material/buttons_test.dart +++ b/packages/flutter/test/material/buttons_test.dart @@ -308,7 +308,7 @@ void main() { tester.renderObject(find.byKey(buttonKey)), paintsExactlyCountTimes(#clipPath, 0) ); - }, skip: true); + }); testWidgets('Disabled MaterialButton has same semantic size as enabled and exposes disabled semantics', (WidgetTester tester) async { final SemanticsTester semantics = new SemanticsTester(tester); diff --git a/packages/flutter/test/material/material_test.dart b/packages/flutter/test/material/material_test.dart index 4ff64193f5..a656f052c3 100644 --- a/packages/flutter/test/material/material_test.dart +++ b/packages/flutter/test/material/material_test.dart @@ -182,7 +182,7 @@ void main() { ); expect(find.byKey(materialKey), hasNoImmediateClip); - }, skip: true); + }); testWidgets('clips to bounding rect by default given Clip.antiAlias', (WidgetTester tester) async { final GlobalKey materialKey = new GlobalKey(); diff --git a/packages/flutter/test/material/outline_button_test.dart b/packages/flutter/test/material/outline_button_test.dart index 38385181b8..ee9e3bdd4b 100644 --- a/packages/flutter/test/material/outline_button_test.dart +++ b/packages/flutter/test/material/outline_button_test.dart @@ -157,7 +157,7 @@ void main() { tester.renderObject(find.byKey(buttonKey)), paintsExactlyCountTimes(#clipPath, 0) ); - }, skip: true); + }); testWidgets('OutlineButton contributes semantics', (WidgetTester tester) async { final SemanticsTester semantics = new SemanticsTester(tester); diff --git a/packages/flutter/test/widgets/clip_test.dart b/packages/flutter/test/widgets/clip_test.dart index 9f7495391a..6ed6a5237e 100644 --- a/packages/flutter/test/widgets/clip_test.dart +++ b/packages/flutter/test/widgets/clip_test.dart @@ -534,7 +534,7 @@ void main() { find.byType(RepaintBoundary).first, matchesGoldenFile('clip.PhysicalModel.default.png'), ); - }, skip: true); + }); Center genPhysicalShape(Clip clipBehavior) { return new Center( @@ -645,5 +645,5 @@ void main() { find.byType(RepaintBoundary).first, matchesGoldenFile('clip.PhysicalShape.default.png'), ); - }, skip: true); + }); }