Skip to content

F
Front-End
Unverified Commit ce8ba6e8 authored by liyuqian's avatar liyuqian Committed by GitHub
Browse files
Options

Set the default clip to Clip.none again. (#20752) 

This reverts commit 8de0e15e and
updates the goldens versoin.

This requires https://github.com/flutter/flutter/pull/20751 to
land first.
parent 3900d42b
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 33 deletions
bin/internal/goldens.version
View file @ ce8ba6e8
cc98e28c974eea0bd9a8e24591857ae6b5479795
1a999092d10a22bc700214b257cd4890c5800078
packages/flutter/lib/src/material/button.dart
View file @ ce8ba6e8
......@@ -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);
......
packages/flutter/lib/src/material/material.dart
View file @ ce8ba6e8
......@@ -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,
......
packages/flutter/lib/src/material/outline_button.dart
View file @ ce8ba6e8
......@@ -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),
......
packages/flutter/lib/src/material/raised_button.dart
View file @ ce8ba6e8
......@@ -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,
......
packages/flutter/lib/src/rendering/layer.dart
View file @ ce8ba6e8
......@@ -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,
......
packages/flutter/lib/src/rendering/proxy_box.dart
View file @ ce8ba6e8
......@@ -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<T> extends _RenderCustomClip<T> {
@required double elevation,
@required Color color,
@required Color shadowColor,
Clip clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use,
Clip clipBehavior = Clip.none,
CustomClipper<T> clipper,
}) : assert(elevation != null),
assert(color != null),
......@@ -1579,7 +1579,7 @@ class RenderPhysicalModel extends _RenderPhysicalModelBase<RRect> {
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<Path> {
RenderPhysicalShape({
RenderBox child,
@required CustomClipper<Path> 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),
......
packages/flutter/lib/src/widgets/basic.dart
View file @ ce8ba6e8
......@@ -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),
......
packages/flutter/lib/src/widgets/implicit_animations.dart
View file @ ce8ba6e8
......@@ -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,
......
packages/flutter/test/material/buttons_test.dart
View file @ ce8ba6e8
......@@ -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);
......
packages/flutter/test/material/material_test.dart
View file @ ce8ba6e8
......@@ -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();
......
packages/flutter/test/material/outline_button_test.dart
View file @ ce8ba6e8
......@@ -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);
......
packages/flutter/test/widgets/clip_test.dart
View file @ ce8ba6e8
......@@ -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);
});
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

HIAST - GitLab