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

Merge pull request #1921 from fredj/text-offset

Browse Source 
Scale the text offset by the device's pixel ratio
This commit is contained in:
Frédéric Junod
2014-03-28 15:37:12 +01:00
parent 8545aa83a9 e0278e0e9c
commit b2e4c4bc1a
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/render/canvas/canvasimmediate.js
+4 -2
View File
@@ -960,8 +960,10 @@ ol.render.canvas.Immediate.prototype.setTextStyle = function(textStyle) {
textTextBaseline : ol.render.canvas.defaultTextBaseline textTextBaseline : ol.render.canvas.defaultTextBaseline
}; };
this.text_ = goog.isDef(textText) ? textText : ''; this.text_ = goog.isDef(textText) ? textText : '';
this.textOffsetX_ = goog.isDef(textOffsetX) ? textOffsetX : 0; this.textOffsetX_ =
this.textOffsetY_ = goog.isDef(textOffsetY) ? textOffsetY : 0; goog.isDef(textOffsetX) ? (this.pixelRatio_ * textOffsetX) : 0;
this.textOffsetY_ =
goog.isDef(textOffsetY) ? (this.pixelRatio_ * textOffsetY) : 0;
this.textRotation_ = goog.isDef(textRotation) ? textRotation : 0; this.textRotation_ = goog.isDef(textRotation) ? textRotation : 0;
this.textScale_ = this.pixelRatio_ * (goog.isDef(textScale) ? this.textScale_ = this.pixelRatio_ * (goog.isDef(textScale) ?
textScale : 1); textScale : 1);
src/ol/render/canvas/canvasreplay.js
+2 -2
View File
@@ -346,9 +346,9 @@ ol.render.canvas.Replay.prototype.replay_ = function(
goog.asserts.assert(goog.isString(instruction[3])); goog.asserts.assert(goog.isString(instruction[3]));
text = /** @type {string} */ (instruction[3]); text = /** @type {string} */ (instruction[3]);
goog.asserts.assert(goog.isNumber(instruction[4])); goog.asserts.assert(goog.isNumber(instruction[4]));
var offsetX = /** @type {number} */ (instruction[4]); var offsetX = /** @type {number} */ (instruction[4]) * pixelRatio;
goog.asserts.assert(goog.isNumber(instruction[5])); goog.asserts.assert(goog.isNumber(instruction[5]));
var offsetY = /** @type {number} */ (instruction[5]); var offsetY = /** @type {number} */ (instruction[5]) * pixelRatio;
goog.asserts.assert(goog.isNumber(instruction[6])); goog.asserts.assert(goog.isNumber(instruction[6]));
rotation = /** @type {number} */ (instruction[6]); rotation = /** @type {number} */ (instruction[6]);
goog.asserts.assert(goog.isNumber(instruction[7])); goog.asserts.assert(goog.isNumber(instruction[7]));