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

Calculate correct text box size

Browse Source
This commit is contained in:
Andreas Hocevar
2017-10-12 00:35:22 +02:00
parent e6534894fd
commit 8dbaf29fca
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/render/canvas/textreplay.js
+5 -5
View File
@@ -318,10 +318,10 @@ ol.render.canvas.TextReplay.prototype.getImage_ = function(text, fill, stroke) {
var width = ol.render.canvas.TextReplay.measureTextWidths(textState.font, lines, widths); var width = ol.render.canvas.TextReplay.measureTextWidths(textState.font, lines, widths);
var lineHeight = ol.render.canvas.TextReplay.measureTextHeight(textState.font); var lineHeight = ol.render.canvas.TextReplay.measureTextHeight(textState.font);
var height = lineHeight * numLines; var height = lineHeight * numLines;
var renderWidth = (width + 2 * strokeWidth); var renderWidth = (width + strokeWidth);
var context = ol.dom.createCanvasContext2D( var context = ol.dom.createCanvasContext2D(
Math.ceil(renderWidth * scale), Math.ceil(renderWidth * scale),
Math.ceil((height + 2 * strokeWidth) * scale)); Math.ceil((height + strokeWidth) * scale));
label = context.canvas; label = context.canvas;
ol.render.canvas.TextReplay.labelCache_.set(key, label); ol.render.canvas.TextReplay.labelCache_.set(key, label);
context.scale(scale, scale); context.scale(scale, scale);
@@ -343,16 +343,16 @@ ol.render.canvas.TextReplay.prototype.getImage_ = function(text, fill, stroke) {
context.textBaseline = 'top'; context.textBaseline = 'top';
context.textAlign = 'center'; context.textAlign = 'center';
var leftRight = (0.5 - align); var leftRight = (0.5 - align);
var x = align * label.width / scale + leftRight * 2 * strokeWidth; var x = align * label.width / scale + leftRight * strokeWidth;
var i; var i;
if (stroke) { if (stroke) {
for (i = 0; i < numLines; ++i) { for (i = 0; i < numLines; ++i) {
context.strokeText(lines[i], x + leftRight * widths[i], strokeWidth + i * lineHeight); context.strokeText(lines[i], x + leftRight * widths[i], 0.5 * strokeWidth + i * lineHeight);
} }
} }
if (fill) { if (fill) {
for (i = 0; i < numLines; ++i) { for (i = 0; i < numLines; ++i) {
context.fillText(lines[i], x + leftRight * widths[i], strokeWidth + i * lineHeight); context.fillText(lines[i], x + leftRight * widths[i], 0.5 * strokeWidth + i * lineHeight);
} }
} }
} }