ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add getters to ol.style.Fill

Browse Source
This commit is contained in:
Éric Lemoine
2013-12-19 11:41:38 +01:00
parent 8fdd178d0a
commit 16047ff852
4 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ol/render/canvas/canvasimmediate.js
View File

@@ -378,8 +378,9 @@ ol.render.canvas.Immediate.prototype.setFillStrokeStyle =
function(fillStyle, strokeStyle) {
var state = this.state_;
if (!goog.isNull(fillStyle)) {
state.fillStyle = ol.color.asString(!goog.isNull(fillStyle.color) ?
fillStyle.color : ol.render.canvas.defaultFillStyle);
var fillStyleColor = fillStyle.getColor();
state.fillStyle = ol.color.asString(!goog.isNull(fillStyleColor) ?
fillStyleColor : ol.render.canvas.defaultFillStyle);
} else {
state.fillStyle = undefined;
}

5
src/ol/render/canvas/canvasreplay.js
View File

@@ -1027,8 +1027,9 @@ ol.render.canvas.PolygonReplay.prototype.setFillStrokeStyle =
goog.asserts.assert(!goog.isNull(fillStyle) || !goog.isNull(strokeStyle));
var state = this.state_;
if (!goog.isNull(fillStyle)) {
state.fillStyle = ol.color.asString(!goog.isNull(fillStyle.color) ?
fillStyle.color : ol.render.canvas.defaultFillStyle);
var fillStyleColor = fillStyle.getColor();
state.fillStyle = ol.color.asString(!goog.isNull(fillStyleColor) ?
fillStyleColor : ol.render.canvas.defaultFillStyle);
} else {
state.fillStyle = undefined;
}

2
src/ol/style/circlestyle.js
View File

@@ -127,7 +127,7 @@ ol.style.Circle.prototype.render_ = function() {
context.arc(size / 2, size / 2, this.radius_, 0, 2 * Math.PI, true);
if (!goog.isNull(this.fill_)) {
context.fillStyle = ol.color.asString(this.fill_.color);
context.fillStyle = ol.color.asString(this.fill_.getColor());
context.fill();
}
if (!goog.isNull(this.stroke_)) {

11
src/ol/style/fillstyle.js
View File

@@ -13,7 +13,16 @@ ol.style.Fill = function(opt_options) {
var options = goog.isDef(opt_options) ? opt_options : {};
/**
* @private
* @type {ol.Color|string}
*/
this.color = goog.isDef(options.color) ? options.color : null;
this.color_ = goog.isDef(options.color) ? options.color : null;
};
/**
* @return {ol.Color|string} Color.
*/
ol.style.Fill.prototype.getColor = function() {
return this.color_;
};