diff options
author | Ansis Brammanis <brammanis@gmail.com> | 2017-06-29 16:35:35 -0400 |
---|---|---|
committer | Ansis Brammanis <brammanis@gmail.com> | 2017-06-29 16:35:35 -0400 |
commit | 9d076dbe6b815c851dc1295a6c9899c992415bd4 (patch) | |
tree | 509185e57c16a441f41dfd1d5bbfae5f55c0b00f | |
parent | 62790098084a0176b79a667d9cb1c9329fc89fd9 (diff) | |
download | qtlocation-mapboxgl-9d076dbe6b815c851dc1295a6c9899c992415bd4.tar.gz |
fix text-offset
-rw-r--r-- | src/mbgl/renderer/painters/painter_symbol.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/text/quads.cpp | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/mbgl/renderer/painters/painter_symbol.cpp b/src/mbgl/renderer/painters/painter_symbol.cpp index 58f4235717..4e4a69bfce 100644 --- a/src/mbgl/renderer/painters/painter_symbol.cpp +++ b/src/mbgl/renderer/painters/painter_symbol.cpp @@ -131,8 +131,6 @@ void Painter::renderSymbol(PaintParameters& parameters, if (alongLine) { reprojectLineLabels(bucket, tile.matrix, true, values, tile, *(bucket.textSizeBinder), state, frameHistory); context.updateVertexBuffer(std::move(bucket.text.dynamicVertices), *bucket.text.dynamicVertexBuffer); - } else { - return; } const Size texsize = geometryTile.glyphAtlasTexture->size; diff --git a/src/mbgl/text/quads.cpp b/src/mbgl/text/quads.cpp index 6a76600162..e4e425794a 100644 --- a/src/mbgl/text/quads.cpp +++ b/src/mbgl/text/quads.cpp @@ -96,7 +96,11 @@ SymbolQuads getGlyphQuads(const Shaping& shapedText, const style::SymbolPlacementType placement, const GlyphPositionMap& positions) { const float textRotate = layout.get<TextRotate>() * util::DEG2RAD; - const std::array<float, 2> textOffset = layout.get<TextOffset>(); + + const float oneEm = 24.0; + std::array<float, 2> textOffset = layout.get<TextOffset>(); + textOffset[0] *= oneEm; + textOffset[1] *= oneEm; SymbolQuads quads; |