Fix outline button solid path when BorderSize.width is used (flutter#51581)

ferhatb · web-flow · commit 599566177736 · 2020-06-19T16:15:58.000-07:00
diff --git a/packages/flutter/lib/src/material/outline_button.dart b/packages/flutter/lib/src/material/outline_button.dart
@@ -561,7 +561,7 @@ class _OutlineBorder extends ShapeBorder implements MaterialStateProperty<ShapeB
       case BorderStyle.none:
         break;
       case BorderStyle.solid:
-        canvas.drawPath(shape.getOuterPath(rect, textDirection: textDirection), side.toPaint());
+        canvas.drawPath(shape.getOuterPath(rect.deflate(side.width / 2.0), textDirection: textDirection), side.toPaint());
     }
   }
 
diff --git a/packages/flutter/test/material/outline_button_test.dart b/packages/flutter/test/material/outline_button_test.dart
@@ -867,6 +867,39 @@ void main() {
     );
   });
 
+  testWidgets('OutlineButton uses borderSide width to paint', (WidgetTester tester) async {
+    final GlobalKey buttonKey = GlobalKey();
+    const double thickness = 12.5;
+    await tester.pumpWidget(
+      Directionality(
+        textDirection: TextDirection.ltr,
+        child: Material(
+          child: Align(
+            alignment: Alignment.topLeft,
+            child: OutlineButton(
+              key: buttonKey,
+              borderSide: const BorderSide(
+                  color: Colors.black12,
+                  width: thickness),
+              onPressed: () {},
+              child: const SizedBox(
+                  width: 120,
+                  height: 50,
+                  child: Text('ABC'),
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+
+    final Finder outlineButton = find.byType(OutlineButton);
+    expect(outlineButton, paints..path(
+      includes: const <Offset>[Offset(60, thickness / 2.0)],
+      excludes: const <Offset>[Offset(60, thickness / 3.0)],
+    ));
+  });
+
   testWidgets('OutlineButton contributes semantics', (WidgetTester tester) async {
     final SemanticsTester semantics = SemanticsTester(tester);
     await tester.pumpWidget(
diff --git a/packages/flutter/test/rendering/mock_canvas.dart b/packages/flutter/test/rendering/mock_canvas.dart
@@ -1163,13 +1163,15 @@ class _PathPaintPredicate extends _DrawCommandPaintPredicate {
     if (includes != null) {
       for (final Offset offset in includes) {
         if (!pathArgument.contains(offset))
-          throw 'It called $methodName with a path that unexpectedly did not contain $offset.';
+          throw 'It called $methodName with a path that unexpectedly did not '
+              'contain $offset. Path bounds = ${pathArgument.getBounds()}';
       }
     }
     if (excludes != null) {
       for (final Offset offset in excludes) {
         if (pathArgument.contains(offset))
-          throw 'It called $methodName with a path that unexpectedly contained $offset.';
+          throw 'It called $methodName with a path that unexpectedly '
+              'contained $offset. . Path bounds = ${pathArgument.getBounds()}';
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -561,7 +561,7 @@ class _OutlineBorder extends ShapeBorder implements MaterialStateProperty<ShapeB`
`561`	`561`	`case BorderStyle.none:`
`562`	`562`	`break;`
`563`	`563`	`case BorderStyle.solid:`
`564`		`- canvas.drawPath(shape.getOuterPath(rect, textDirection: textDirection), side.toPaint());`
	`564`	`+ canvas.drawPath(shape.getOuterPath(rect.deflate(side.width / 2.0), textDirection: textDirection), side.toPaint());`
`565`	`565`	`}`
`566`	`566`	`}`
`567`	`567`
Original file line number	Diff line number	Diff line change
`@@ -1163,13 +1163,15 @@ class _PathPaintPredicate extends _DrawCommandPaintPredicate {`
`1163`	`1163`	`if (includes != null) {`
`1164`	`1164`	`for (final Offset offset in includes) {`
`1165`	`1165`	`if (!pathArgument.contains(offset))`
`1166`		`- throw 'It called $methodName with a path that unexpectedly did not contain $offset.';`
	`1166`	`+ throw 'It called $methodName with a path that unexpectedly did not '`
	`1167`	`+ 'contain $offset. Path bounds = ${pathArgument.getBounds()}';`
`1167`	`1168`	`}`
`1168`	`1169`	`}`
`1169`	`1170`	`if (excludes != null) {`
`1170`	`1171`	`for (final Offset offset in excludes) {`
`1171`	`1172`	`if (pathArgument.contains(offset))`
`1172`		`- throw 'It called $methodName with a path that unexpectedly contained $offset.';`
	`1173`	`+ throw 'It called $methodName with a path that unexpectedly '`
	`1174`	`+ 'contained $offset. . Path bounds = ${pathArgument.getBounds()}';`
`1173`	`1175`	`}`
`1174`	`1176`	`}`
`1175`	`1177`	`}`