scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-01-19 06:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix issues with #dashOffset when emulating native dashes.

Browse source 
Closes #303.
This commit is contained in:
Jürg Lehni 2013-10-08 10:50:59 +02:00
parent 9c98ef8316
commit 9103c19e6f
1 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/path/Path.js
View file

@ -1924,12 +1924,19 @@ var Path = PathItem.extend(/** @lends Path# */{
fillColor = style.getFillColor(),
strokeColor = style.getStrokeColor(),
dashArray = style.getDashArray(),
drawDash = !paper.support.nativeDash && strokeColor
// dashLength is only set if we can't draw dashes natively
dashLength = !paper.support.nativeDash && strokeColor
&& dashArray && dashArray.length;
function getOffset(i) {
// Negative modulo is necessary since we're stepping back
// in the dash sequence first.
return dashArray[((i % dashLength) + dashLength) % dashLength];
}
// Prepare the canvas path if we have any situation that requires it
// to be defined.
if (fillColor || strokeColor && !drawDash || compound || clip)
if (fillColor || strokeColor && !dashLength || compound || clip)
drawSegments(ctx, this);
if (this._closed)
@ -1942,17 +1949,26 @@ var Path = PathItem.extend(/** @lends Path# */{
if (fillColor)
ctx.fill();
if (strokeColor) {
if (drawDash) {
if (dashLength) {
// We cannot use the path created by drawSegments above
// Use CurveFlatteners to draw dashed paths:
ctx.beginPath();
var flattener = new PathFlattener(this),
from = style.getDashOffset(), to,
length = flattener.length,
from = -style.getDashOffset(), to,
i = 0;
while (from < flattener.length) {
to = from + dashArray[(i++) % dashArray.length];
flattener.drawPart(ctx, from, to);
from = to + dashArray[(i++) % dashArray.length];
from = from % length;
// Step backwards in the dash sequence first until the
// from parameter is below 0.
while (from > 0) {
from -= getOffset(i--) + getOffset(i--);
}
while (from < length) {
to = from + getOffset(i++);
if (from > 0 || to > 0)
flattener.drawPart(ctx,
Math.max(from, 0), Math.max(to, 0));
from = to + getOffset(i++);
}
}
ctx.stroke();