Skip to content

Refactor StrokeAlign to allow double values. #108339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
auto-submit merged 26 commits into from
Aug 15, 2022
Merged

Refactor StrokeAlign to allow double values. #108339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
f974e4e
Refactor StrokeAlign to allow any value.
bernaferrari Jul 27, 2022
d5af3c9
Greg Patch
bernaferrari Jul 27, 2022
0bb6bd5
Patch fixes.
bernaferrari Jul 27, 2022
75bb18d
Make dimensions non-negative.
bernaferrari Jul 28, 2022
3f8e9cb
Add multiple StrokeAlign.
bernaferrari Jul 28, 2022
045c152
Revert "Add multiple StrokeAlign."
bernaferrari Jul 28, 2022
4a20d21
Small fixes.
bernaferrari Jul 29, 2022
39bfb55
Fix StarBorder.
bernaferrari Jul 29, 2022
6e0175f
Remove StrokeAlign. Most painful commit in a while.
bernaferrari Jul 29, 2022
ccef943
Fix typo.
bernaferrari Jul 29, 2022
d63482b
Refactor sample.
bernaferrari Jul 29, 2022
d562415
Rename strokeOffset -> halfStrokeOffset
bernaferrari Jul 29, 2022
7e97fd0
Imprrove documentation.
bernaferrari Jul 29, 2022
97a396d
Fix doc.
bernaferrari Jul 29, 2022
aba0366
Fix BoxDecoration with borderRadius.
bernaferrari Jul 29, 2022
30b917f
Re-add StrokeAlign class. It is back. For now.
bernaferrari Jul 31, 2022
d1f571e
Fix PR comments.
bernaferrari Aug 1, 2022
acb25ac
Fix analyzer.
bernaferrari Aug 1, 2022
1cad490
Rename description
bernaferrari Aug 1, 2022
e2e877d
Add "for example".
bernaferrari Aug 2, 2022
172ab57
Fix typo.
bernaferrari Aug 2, 2022
8106006
Bring back BorderSide.strokeAlignInside.
bernaferrari Aug 3, 2022
7aa2408
Fix test
bernaferrari Aug 6, 2022
40f96e5
Fix PR comments.
bernaferrari Aug 15, 2022
c6f42aa
Fix redundant import.
bernaferrari Aug 15, 2022
4eda7a3
Fix test (ops).
bernaferrari Aug 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dev/manual_tests/lib/star_border.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class _MyHomePageState extends State<MyHomePage> {
color: Colors.blue.shade100,
shape: lerpBorder(
StarBorder.polygon(
side: const BorderSide(strokeAlign: StrokeAlign.center, width: 2),
side: const BorderSide(strokeAlign: BorderSide.strokeAlignCenter, width: 2),
sides: _model.points,
pointRounding: _model.pointRounding,
rotation: _model.rotation,
Expand All @@ -102,7 +102,7 @@ class _MyHomePageState extends State<MyHomePage> {
color: Colors.blue.shade100,
shape: lerpBorder(
StarBorder(
side: const BorderSide(strokeAlign: StrokeAlign.center, width: 2),
side: const BorderSide(strokeAlign: BorderSide.strokeAlignCenter, width: 2),
points: _model.points,
innerRadiusRatio: _model.innerRadiusRatio,
pointRounding: _model.pointRounding,
Expand Down
204 changes: 204 additions & 0 deletions examples/api/lib/painting/borders/border_side.0.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,204 @@
// Copyright 2014 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

/// Flutter code sample for [BorderSide].

import 'package:flutter/material.dart';

void main() => runApp(const BorderSideApp());

class BorderSideApp extends StatelessWidget {
const BorderSideApp({super.key});

@override
Widget build(BuildContext context) {
return const MaterialApp(home: BorderSideExample());
}
}

class BorderSideExample extends StatefulWidget {
const BorderSideExample({super.key});

@override
State<BorderSideExample> createState() => _BorderSideExampleState();
}

class _BorderSideExampleState extends State<BorderSideExample>
with TickerProviderStateMixin {
late final AnimationController animation;

@override
void initState() {
super.initState();
animation =
AnimationController(vsync: this, duration: const Duration(seconds: 1));
animation.repeat(reverse: true);
animation.addListener(_markDirty);
}

@override
void dispose() {
animation.dispose();
super.dispose();
}

void _markDirty() {
setState(() {});
}

static const double borderWidth = 10;
static const double cornerRadius = 10;
static const Color borderColor = Color(0x8000b4fc);

@override
Widget build(BuildContext context) {
return Material(
child: Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: <Widget>[
TestBox(
shape: StadiumBorder(
side: BorderSide(
color: borderColor,
width: borderWidth,
strokeAlign: (animation.value * 2) - 1,
),
),
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: <Widget>[
TestBox(
shape: CircleBorder(
side: BorderSide(
color: borderColor,
width: borderWidth,
strokeAlign: (animation.value * 2) - 1,
),
),
),
TestBox(
shape: OvalBorder(
side: BorderSide(
color: borderColor,
width: borderWidth,
strokeAlign: (animation.value * 2) - 1,
),
),
),
],
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: <Widget>[
TestBox(
shape: BeveledRectangleBorder(
side: BorderSide(
color: borderColor,
width: borderWidth,
strokeAlign: (animation.value * 2) - 1,
),
),
),
TestBox(
shape: BeveledRectangleBorder(
borderRadius: BorderRadius.circular(cornerRadius),
side: BorderSide(
color: borderColor,
width: borderWidth,
strokeAlign: (animation.value * 2) - 1,
),
),
),
],
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: <Widget>[
TestBox(
shape: RoundedRectangleBorder(
side: BorderSide(
color: borderColor,
width: borderWidth,
strokeAlign: (animation.value * 2) - 1,
),
),
),
TestBox(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(cornerRadius),
side: BorderSide(
color: borderColor,
width: borderWidth,
strokeAlign: (animation.value * 2) - 1,
),
),
),
],
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: <Widget>[
TestBox(
shape: StarBorder(
side: BorderSide(
color: borderColor,
width: borderWidth,
strokeAlign: (animation.value * 2) - 1,
),
),
),
TestBox(
shape: StarBorder(
pointRounding: 1,
innerRadiusRatio: 0.5,
points: 8,
side: BorderSide(
color: borderColor,
width: borderWidth,
strokeAlign: (animation.value * 2) - 1,
),
),
),
TestBox(
shape: StarBorder.polygon(
sides: 6,
pointRounding: 0.5,
side: BorderSide(
color: borderColor,
width: borderWidth,
strokeAlign: (animation.value * 2) - 1,
),
),
),
],
),
],
),
),
);
}
}

class TestBox extends StatelessWidget {
const TestBox({
super.key,
required this.shape,
});

final ShapeBorder shape;

@override
Widget build(BuildContext context) {
return Container(
width: 100,
height: 50,
decoration: ShapeDecoration(
color: const Color(0xff012677),
shape: shape,
),
);
}
}
21 changes: 21 additions & 0 deletions examples/api/test/painting/border_side.0_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// Copyright 2014 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'package:flutter/material.dart';
import 'package:flutter_api_samples/painting/borders/border_side.0.dart'
as example;
import 'package:flutter_test/flutter_test.dart';

void main() {
testWidgets('Finds the expected TestBox', (WidgetTester tester) async {
await tester.pumpWidget(
const MaterialApp(
home: example.BorderSideExample(),
),
);

expect(find.byType(example.BorderSideExample), findsOneWidget);
expect(find.byType(example.TestBox), findsNWidgets(10));
});
}
45 changes: 2 additions & 43 deletions packages/flutter/lib/src/painting/beveled_rectangle_border.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import 'package:flutter/foundation.dart';
import 'basic_types.dart';
import 'border_radius.dart';
import 'borders.dart';
import 'edge_insets.dart';

/// A rectangular border with flattened or "beveled" corners.
///
Expand Down Expand Up @@ -40,18 +39,6 @@ class BeveledRectangleBorder extends OutlinedBorder {
/// [getOuterPath].
final BorderRadiusGeometry borderRadius;

@override
EdgeInsetsGeometry get dimensions {
switch (side.strokeAlign) {
case StrokeAlign.inside:
return EdgeInsets.all(side.width);
case StrokeAlign.center:
return EdgeInsets.all(side.width / 2);
case StrokeAlign.outside:
return EdgeInsets.zero;
}
}

@override
ShapeBorder scale(double t) {
return BeveledRectangleBorder(
Expand Down Expand Up @@ -125,21 +112,7 @@ class BeveledRectangleBorder extends OutlinedBorder {

@override
Path getInnerPath(Rect rect, { TextDirection? textDirection }) {
final RRect borderRect = borderRadius.resolve(textDirection).toRRect(rect);
final RRect adjustedRect;
switch (side.strokeAlign) {
case StrokeAlign.inside:
adjustedRect = borderRect.deflate(side.width);
break;
case StrokeAlign.center:
adjustedRect = borderRect.deflate(side.width / 2);
break;
case StrokeAlign.outside:
adjustedRect = borderRect;
break;
}

return _getPath(adjustedRect);
return _getPath(borderRadius.resolve(textDirection).toRRect(rect).deflate(side.strokeInset));
}

@override
Expand All @@ -156,21 +129,7 @@ class BeveledRectangleBorder extends OutlinedBorder {
case BorderStyle.none:
break;
case BorderStyle.solid:
final RRect borderRect = borderRadius.resolve(textDirection).toRRect(rect);
final RRect adjustedRect;
switch (side.strokeAlign) {
case StrokeAlign.inside:
adjustedRect = borderRect;
break;
case StrokeAlign.center:
adjustedRect = borderRect.inflate(side.width / 2);
break;
case StrokeAlign.outside:
adjustedRect = borderRect.inflate(side.width);
break;
}
final Path path = _getPath(adjustedRect)
..addPath(getInnerPath(rect, textDirection: textDirection), Offset.zero);
final Path path = _getPath(borderRadius.resolve(textDirection).toRRect(rect).inflate(side.strokeOffset / 2));
canvas.drawPath(path, side.toPaint());
break;
}
Expand Down
Loading