feat(shapes): add dotted and dashed stroke styles #1003
+335
−23
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| { | ||
| "permissions": { | ||
| "allow": [ | ||
| "Bash(flutter build:*)", | ||
| "Bash(flutter upgrade:*)", | ||
| "Bash(dart run build_runner:*)", | ||
| "Bash(flutter gen-l10n:*)" | ||
| ] | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -9,6 +9,47 @@ class ShapeRenderer extends Renderer<ShapeElement> { | |||||
|
|
||||||
| ShapeRenderer(super.element, [super.layer]); | ||||||
|
|
||||||
| /// Creates a dashed path from the source path based on stroke style | ||||||
| Path _createDashedPath(Path source, StrokeStyle strokeStyle) { | ||||||
| if (strokeStyle == StrokeStyle.solid) return source; | ||||||
|
|
||||||
| final strokeWidth = element.property.strokeWidth; | ||||||
| final dashLength = strokeStyle == StrokeStyle.dashed | ||||||
| ? strokeWidth * 3 // Dashed: 3x stroke width | ||||||
|
||||||
| : strokeWidth; // Dotted: 1x stroke width | ||||||
| final gapLength = strokeWidth * 2; | ||||||
|
|
||||||
| final dashedPath = Path(); | ||||||
| for (final metric in source.computeMetrics()) { | ||||||
| double distance = 0; | ||||||
| bool draw = true; | ||||||
| while (distance < metric.length) { | ||||||
| final length = draw ? dashLength : gapLength; | ||||||
| final end = (distance + length).clamp(0.0, metric.length); | ||||||
| if (draw) { | ||||||
| dashedPath.addPath( | ||||||
| metric.extractPath(distance, end), | ||||||
| Offset.zero, | ||||||
| ); | ||||||
| } | ||||||
| distance = end; | ||||||
| draw = !draw; | ||||||
| } | ||||||
| } | ||||||
| return dashedPath; | ||||||
| } | ||||||
|
|
||||||
| /// Draws a path with the appropriate stroke style (solid, dashed, or dotted) | ||||||
| void _drawStyledPath(Canvas canvas, Path path, Paint paint) { | ||||||
| final strokeStyle = element.property.strokeStyle; | ||||||
| if (strokeStyle == StrokeStyle.solid) { | ||||||
| canvas.drawPath(path, paint); | ||||||
| } else { | ||||||
| final dashedPath = _createDashedPath(path, strokeStyle); | ||||||
| canvas.drawPath(dashedPath, paint); | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| @override | ||||||
| void build( | ||||||
| Canvas canvas, | ||||||
|
|
@@ -52,16 +93,15 @@ class ShapeRenderer extends Renderer<ShapeElement> { | |||||
| ), | ||||||
| ); | ||||||
| if (strokeWidth > 0) { | ||||||
| final rrect = RRect.fromRectAndCorners( | ||||||
| rect, | ||||||
| topLeft: topLeftCornerRadius, | ||||||
| topRight: topRightCornerRadius, | ||||||
| bottomLeft: bottomLeftCornerRadius, | ||||||
| bottomRight: bottomRightCornerRadius, | ||||||
| ); | ||||||
|
Comment on lines
94
to
100
There was a problem hiding this comment. The stroke path is created using Suggested fix: final rrect = RRect.fromRectAndCorners(
drawRect, // Change from rect to drawRect
topLeft: topLeftCornerRadius,
topRight: topRightCornerRadius,
bottomLeft: bottomLeftCornerRadius,
bottomRight: bottomRightCornerRadius,
); |
||||||
| final path = Path()..addRRect(rrect); | ||||||
| _drawStyledPath(canvas, path, paint); | ||||||
| } | ||||||
| } else if (shape is CircleShape) { | ||||||
| canvas.drawOval( | ||||||
|
|
@@ -72,14 +112,14 @@ class ShapeRenderer extends Renderer<ShapeElement> { | |||||
| ), | ||||||
| ); | ||||||
| if (strokeWidth > 0) { | ||||||
| final path = Path()..addOval(rect); | ||||||
|
||||||
| final path = Path()..addOval(rect); | |
| final path = Path()..addOval(drawRect); |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please dont add this file