Skip to content

Fix Zero pointBorderWidth still drawing border #5180

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

Closed
wants to merge 8 commits into from
Closed

Fix Zero pointBorderWidth still drawing border #5180

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
71de85f
If zero borderWidth set stroke to opaque
Jan 24, 2018
6ab81b4
Code quality
Jan 24, 2018
0dd9335
Only compute line width once
Jan 25, 2018
02fb541
Comment
Jan 25, 2018
48e6bf2
Merge branch 'master' into ZeroBorderWidthFix
jhaenchen Apr 25, 2018
4531caa
Fix indentation
jhaenchen Aug 21, 2018
657649d
Remove unnecessary intermediary variable
jhaenchen Aug 21, 2018
a9d6db5
Move strokestyle up a line to minimize diff
jhaenchen Aug 21, 2018
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: 1 addition & 1 deletion src/elements/element.point.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ module.exports = Element.extend({

// Clipping for Points.
if (chartArea === undefined || (model.x >= chartArea.left && chartArea.right * errMargin >= model.x && model.y >= chartArea.top && chartArea.bottom * errMargin >= model.y)) {
ctx.strokeStyle = vm.borderColor || defaultColor;
ctx.strokeStyle = ctx.lineWidth === 0 ? 'rgba(0,0,0,0)' : vm.borderColor || defaultColor;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are trying to access ctx.lineWidth before assigning it a value (next line), is that expected?

Though, I think @benmccann suggestion was wrong because according the MDN:

lineWidth: A number specifying the line width in space units. Zero, negative, Infinity and NaN values are ignored.

image

So ctx.lineWidth will never match ctx.lineWidth === 0 (because ignored) so I would keep your first approach and cache the lineWidth value (and check for lineWidth === null or undefined using !lineWidth):

// ...
var errMargin = 1.01;
var lineWidth;

//...

lineWidth = helpers.valueOrDefault(vm.borderWidth, defaults.global.elements.point.borderWidth);
ctx.strokeStyle = !lineWidth ? 'rgba(0,0,0,0)' : vm.borderColor || defaultColor;
ctx.lineWidth = lineWidth;

ctx.lineWidth = helpers.valueOrDefault(vm.borderWidth, defaults.global.elements.point.borderWidth);
ctx.fillStyle = vm.backgroundColor || defaultColor;
helpers.canvas.drawPoint(ctx, pointStyle, radius, x, y);
Expand Down