firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove private OutlinedButton default outline geometry class (#70975)

Browse Source
This commit is contained in:
Hans Muller 2020-11-23 14:03:47 -08:00 committed by GitHub
parent 3a479e7efd
commit 89a7bf7791
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
packages/flutter/lib/src/material/outlined_button.dart
View File

@ -242,7 +242,7 @@ class OutlinedButton extends ButtonStyleButton {
color: Theme.of(context).colorScheme.onSurface.withOpacity(0.12),
width: 1,
),
shape: const _Outline(borderRadius: BorderRadius.all(Radius.circular(4))),
shape: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(4))),
enabledMouseCursor: SystemMouseCursors.click,
disabledMouseCursor: SystemMouseCursors.forbidden,
visualDensity: theme.visualDensity,
@ -349,69 +349,3 @@ class _OutlinedButtonWithIconChild extends StatelessWidget {
);
}
}
// This subclass only exists for the sake of backwards compatibility with the
// outline drawn by the original OutlineButton widget. The paint override
// draws a Path that's stroked with BorderSide, rather than filling a rounded
// rect whose inner path is the outer path inset by the BorderSide's width.
class _Outline extends RoundedRectangleBorder {
const _Outline({
BorderSide side = BorderSide.none,
required BorderRadiusGeometry borderRadius,
}) : super(side: side, borderRadius: borderRadius);
@override
ShapeBorder scale(double t) {
return _Outline(
side: side.scale(t),
borderRadius: borderRadius * t,
);
}
@override
ShapeBorder? lerpFrom(ShapeBorder? a, double t) {
assert(t != null);
if (a is _Outline) {
return _Outline(
side: BorderSide.lerp(a.side, side, t),
borderRadius: BorderRadiusGeometry.lerp(a.borderRadius, borderRadius, t)!,
);
}
return super.lerpFrom(a, t);
}
@override
ShapeBorder? lerpTo(ShapeBorder? b, double t) {
assert(t != null);
if (b is _Outline) {
return _Outline(
side: BorderSide.lerp(side, b.side, t),
borderRadius: BorderRadiusGeometry.lerp(borderRadius, b.borderRadius, t)!,
);
}
return super.lerpTo(b, t);
}
@override
_Outline copyWith({ BorderSide? side, BorderRadius? borderRadius }) {
return _Outline(
side: side ?? this.side,
borderRadius: borderRadius ?? this.borderRadius,
);
}
@override
void paint(Canvas canvas, Rect rect, { TextDirection? textDirection }) {
switch (side.style) {
case BorderStyle.none:
break;
case BorderStyle.solid:
if (side.width == 0.0) {
super.paint(canvas, rect, textDirection: textDirection);
} else {
canvas.drawPath(getOuterPath(rect, textDirection: textDirection), side.toPaint());
}
}
}
}

8
packages/flutter/test/material/outlined_button_test.dart
View File

@ -542,12 +542,12 @@ void main() {
final Finder outlinedButton = find.byType(OutlinedButton);
// Default, not disabled.
expect(outlinedButton, paints..path(color: defaultColor));
expect(outlinedButton, paints..drrect(color: defaultColor));
// Focused.
focusNode.requestFocus();
await tester.pumpAndSettle();
expect(outlinedButton, paints..path(color: focusedColor));
expect(outlinedButton, paints..drrect(color: focusedColor));
// Hovered.
final Offset center = tester.getCenter(find.byType(OutlinedButton));
@ -558,12 +558,12 @@ void main() {
addTearDown(gesture.removePointer);
await gesture.moveTo(center);
await tester.pumpAndSettle();
expect(outlinedButton, paints..path(color: hoverColor));
expect(outlinedButton, paints..drrect(color: hoverColor));
// Highlighted (pressed).
await gesture.down(center);
await tester.pumpAndSettle();
expect(outlinedButton, paints..path(color: pressedColor));
expect(outlinedButton, paints..drrect(color: pressedColor));
});
testWidgets('OutlinedButton onPressed and onLongPress callbacks are correctly called when non-null', (WidgetTester tester) async {