summaryrefslogtreecommitdiff
path: root/src/mbgl/layout
diff options
context:
space:
mode:
authorAlexander Shalamov <alexander.shalamov@mapbox.com>2019-11-19 11:50:55 +0200
committerAlexander Shalamov <alexander.shalamov@mapbox.com>2019-12-02 17:11:49 +0200
commit614000256b709ff9d566740534f68c4cb795e0f2 (patch)
tree59271e9aa68699dd3ecc866f8b47983bf7394cbc /src/mbgl/layout
parent33ba4052b67436b09f1dff21991673f6ea37275e (diff)
downloadqtlocation-mapboxgl-614000256b709ff9d566740534f68c4cb795e0f2.tar.gz
[core] Shape images in labels at bucket zoom level
Diffstat (limited to 'src/mbgl/layout')
-rw-r--r--src/mbgl/layout/symbol_layout.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mbgl/layout/symbol_layout.cpp b/src/mbgl/layout/symbol_layout.cpp
index 4c5836df21..ca61844417 100644
--- a/src/mbgl/layout/symbol_layout.cpp
+++ b/src/mbgl/layout/symbol_layout.cpp
@@ -355,6 +355,7 @@ void SymbolLayout::prepareSymbols(const GlyphMap& glyphMap,
optional<PositionedIcon> shapedIcon;
std::array<float, 2> textOffset{{0.0f, 0.0f}};
const float layoutTextSize = layout->evaluate<TextSize>(zoom + 1, feature);
+ const float layoutTextSizeAtBucketZoomLevel = layout->evaluate<TextSize>(zoom, feature);
const float layoutIconSize = layout->evaluate<IconSize>(zoom + 1, feature);
// if feature has text, shape the text
@@ -381,6 +382,7 @@ void SymbolLayout::prepareSymbols(const GlyphMap& glyphMap,
/* glyphs */ glyphPositions,
/* images */ imagePositions,
layoutTextSize,
+ layoutTextSizeAtBucketZoomLevel,
allowVerticalPlacement);
return result;