Support for lineDashOffset
This commit is contained in:
@@ -735,6 +735,7 @@ ol.render.canvas.Immediate.prototype.setContextStrokeState_ = function(strokeSta
|
|||||||
context.lineCap = strokeState.lineCap;
|
context.lineCap = strokeState.lineCap;
|
||||||
if (ol.has.CANVAS_LINE_DASH) {
|
if (ol.has.CANVAS_LINE_DASH) {
|
||||||
context.setLineDash(strokeState.lineDash);
|
context.setLineDash(strokeState.lineDash);
|
||||||
|
context.lineDashOffset = strokeState.lineDashOffset;
|
||||||
}
|
}
|
||||||
context.lineJoin = strokeState.lineJoin;
|
context.lineJoin = strokeState.lineJoin;
|
||||||
context.lineWidth = strokeState.lineWidth;
|
context.lineWidth = strokeState.lineWidth;
|
||||||
@@ -743,6 +744,7 @@ ol.render.canvas.Immediate.prototype.setContextStrokeState_ = function(strokeSta
|
|||||||
this.contextStrokeState_ = {
|
this.contextStrokeState_ = {
|
||||||
lineCap: strokeState.lineCap,
|
lineCap: strokeState.lineCap,
|
||||||
lineDash: strokeState.lineDash,
|
lineDash: strokeState.lineDash,
|
||||||
|
lineDashOffset: strokeState.lineDashOffset,
|
||||||
lineJoin: strokeState.lineJoin,
|
lineJoin: strokeState.lineJoin,
|
||||||
lineWidth: strokeState.lineWidth,
|
lineWidth: strokeState.lineWidth,
|
||||||
miterLimit: strokeState.miterLimit,
|
miterLimit: strokeState.miterLimit,
|
||||||
@@ -757,6 +759,10 @@ ol.render.canvas.Immediate.prototype.setContextStrokeState_ = function(strokeSta
|
|||||||
contextStrokeState.lineDash, strokeState.lineDash)) {
|
contextStrokeState.lineDash, strokeState.lineDash)) {
|
||||||
context.setLineDash(contextStrokeState.lineDash = strokeState.lineDash);
|
context.setLineDash(contextStrokeState.lineDash = strokeState.lineDash);
|
||||||
}
|
}
|
||||||
|
if (contextStrokeState.lineDashOffset != strokeState.lineDashOffset) {
|
||||||
|
contextStrokeState.lineDashOffset = context.lineDashOffset =
|
||||||
|
strokeState.lineDashOffset;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (contextStrokeState.lineJoin != strokeState.lineJoin) {
|
if (contextStrokeState.lineJoin != strokeState.lineJoin) {
|
||||||
contextStrokeState.lineJoin = context.lineJoin = strokeState.lineJoin;
|
contextStrokeState.lineJoin = context.lineJoin = strokeState.lineJoin;
|
||||||
|
|||||||
@@ -317,6 +317,7 @@ ol.style.RegularShape.prototype.render_ = function(atlasManager) {
|
|||||||
var lineJoin = '';
|
var lineJoin = '';
|
||||||
var miterLimit = 0;
|
var miterLimit = 0;
|
||||||
var lineDash = null;
|
var lineDash = null;
|
||||||
|
var lineDashOffset = 0;
|
||||||
var strokeStyle;
|
var strokeStyle;
|
||||||
var strokeWidth = 0;
|
var strokeWidth = 0;
|
||||||
|
|
||||||
@@ -331,8 +332,10 @@ ol.style.RegularShape.prototype.render_ = function(atlasManager) {
|
|||||||
strokeWidth = ol.render.canvas.defaultLineWidth;
|
strokeWidth = ol.render.canvas.defaultLineWidth;
|
||||||
}
|
}
|
||||||
lineDash = this.stroke_.getLineDash();
|
lineDash = this.stroke_.getLineDash();
|
||||||
|
lineDashOffset = this.stroke_.getLineDashOffset();
|
||||||
if (!ol.has.CANVAS_LINE_DASH) {
|
if (!ol.has.CANVAS_LINE_DASH) {
|
||||||
lineDash = null;
|
lineDash = null;
|
||||||
|
lineDashOffset = 0;
|
||||||
}
|
}
|
||||||
lineJoin = this.stroke_.getLineJoin();
|
lineJoin = this.stroke_.getLineJoin();
|
||||||
if (lineJoin === undefined) {
|
if (lineJoin === undefined) {
|
||||||
@@ -357,6 +360,7 @@ ol.style.RegularShape.prototype.render_ = function(atlasManager) {
|
|||||||
size: size,
|
size: size,
|
||||||
lineCap: lineCap,
|
lineCap: lineCap,
|
||||||
lineDash: lineDash,
|
lineDash: lineDash,
|
||||||
|
lineDashOffset: lineDashOffset,
|
||||||
lineJoin: lineJoin,
|
lineJoin: lineJoin,
|
||||||
miterLimit: miterLimit
|
miterLimit: miterLimit
|
||||||
};
|
};
|
||||||
@@ -460,6 +464,7 @@ ol.style.RegularShape.prototype.draw_ = function(renderOptions, context, x, y) {
|
|||||||
context.lineWidth = renderOptions.strokeWidth;
|
context.lineWidth = renderOptions.strokeWidth;
|
||||||
if (renderOptions.lineDash) {
|
if (renderOptions.lineDash) {
|
||||||
context.setLineDash(renderOptions.lineDash);
|
context.setLineDash(renderOptions.lineDash);
|
||||||
|
context.lineDashOffset = renderOptions.lineDashOffset;
|
||||||
}
|
}
|
||||||
context.lineCap = renderOptions.lineCap;
|
context.lineCap = renderOptions.lineCap;
|
||||||
context.lineJoin = renderOptions.lineJoin;
|
context.lineJoin = renderOptions.lineJoin;
|
||||||
@@ -533,6 +538,7 @@ ol.style.RegularShape.prototype.drawHitDetectionCanvas_ = function(renderOptions
|
|||||||
context.lineWidth = renderOptions.strokeWidth;
|
context.lineWidth = renderOptions.strokeWidth;
|
||||||
if (renderOptions.lineDash) {
|
if (renderOptions.lineDash) {
|
||||||
context.setLineDash(renderOptions.lineDash);
|
context.setLineDash(renderOptions.lineDash);
|
||||||
|
context.lineDashOffset = renderOptions.lineDashOffset;
|
||||||
}
|
}
|
||||||
context.stroke();
|
context.stroke();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -79,6 +79,7 @@ ol.CanvasFunctionType;
|
|||||||
/**
|
/**
|
||||||
* @typedef {{lineCap: string,
|
* @typedef {{lineCap: string,
|
||||||
* lineDash: Array.<number>,
|
* lineDash: Array.<number>,
|
||||||
|
* lineDashOffset: number,
|
||||||
* lineJoin: string,
|
* lineJoin: string,
|
||||||
* lineWidth: number,
|
* lineWidth: number,
|
||||||
* miterLimit: number,
|
* miterLimit: number,
|
||||||
|
|||||||
Reference in New Issue
Block a user