Skip to content
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

Jump to bottom

Change borderCapStyle and borderJoinStyle defaults to be compatible with SKIA canvas #939

Merged
merged 8 commits into from
Sep 25, 2024
Merged

Change borderCapStyle and borderJoinStyle defaults to be compatible with SKIA canvas #939

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
95831aa
Fix defaults for skia canvas
mlohbihler Aug 16, 2024
b6bfa5e
workflow dispatch
mlohbihler Aug 23, 2024
564277e
Include properties in arrowhead defaults, but leave undefined
mlohbihler Aug 23, 2024
71e7903
Merge branch 'chartjs:master' into master
mlohbihler Sep 19, 2024
f0d947a
Merge branch 'master' into lineCap-lineJoin
mlohbihler Sep 19, 2024
090bd36
Undo auto-formatting
mlohbihler Sep 19, 2024
0bce23d
Replace changes with single helper change
mlohbihler Sep 24, 2024
595132f
Remove undefined settings too
mlohbihler Sep 24, 2024
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
2 changes: 2 additions & 0 deletions src/types/ellipse.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,10 @@ EllipseAnnotation.id = 'ellipseAnnotation';
EllipseAnnotation.defaults = {
adjustScaleRange: true,
backgroundShadowColor: 'transparent',
borderCapStyle: 'butt',
borderDash: [],
borderDashOffset: 0,
borderJoinStyle: 'miter',
borderShadowColor: 'transparent',
borderWidth: 1,
display: true,
Expand Down
4 changes: 4 additions & 0 deletions src/types/line.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,11 @@ LineAnnotation.id = 'lineAnnotation';
const arrowHeadsDefaults = {
backgroundColor: undefined,
backgroundShadowColor: undefined,
borderCapStyle: 'butt',
stockiNail marked this conversation as resolved.
Show resolved Hide resolved
borderColor: undefined,
borderDash: undefined,
borderDashOffset: undefined,
borderJoinStyle: 'miter',
stockiNail marked this conversation as resolved.
Show resolved Hide resolved
borderShadowColor: undefined,
borderWidth: undefined,
display: undefined,
Expand All @@ -131,8 +133,10 @@ LineAnnotation.defaults = {
start: Object.assign({}, arrowHeadsDefaults),
width: 6
},
borderCapStyle: 'butt',
borderDash: [],
borderDashOffset: 0,
borderJoinStyle: 'miter',
borderShadowColor: 'transparent',
borderWidth: 2,
curve: false,
Expand Down
2 changes: 2 additions & 0 deletions src/types/point.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,10 @@ PointAnnotation.id = 'pointAnnotation';
PointAnnotation.defaults = {
adjustScaleRange: true,
backgroundShadowColor: 'transparent',
borderCapStyle: 'butt',
borderDash: [],
borderDashOffset: 0,
borderJoinStyle: 'miter',
borderShadowColor: 'transparent',
borderWidth: 1,
display: true,
Expand Down
Loading