diff options
| author | Asheem Mamoowala <asheem.mamoowala@mapbox.com> | 2017-08-25 16:11:24 -0700 |
|---|---|---|
| committer | Asheem Mamoowala <asheem.mamoowala@mapbox.com> | 2017-08-30 10:59:08 -0700 |
| commit | 69b52367d35616850b73b03f807ab5c0747c5187 (patch) | |
| tree | b0dbb913b45257b0875a128f25da1e081765c7bb /src/mbgl/layout/symbol_layout.cpp | |
| parent | 966bf8824d8d0a33bc0f99d4978a10126fc61b6a (diff) | |
| download | qtlocation-mapboxgl-69b52367d35616850b73b03f807ab5c0747c5187.tar.gz | |
[core][ios][macos][android]DDS-ify `text-letter-spacing` and `text-max-width`
Diffstat (limited to 'src/mbgl/layout/symbol_layout.cpp')
| -rw-r--r-- | src/mbgl/layout/symbol_layout.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/layout/symbol_layout.cpp b/src/mbgl/layout/symbol_layout.cpp index adb8ce5927..2c90b69b08 100644 --- a/src/mbgl/layout/symbol_layout.cpp +++ b/src/mbgl/layout/symbol_layout.cpp @@ -205,11 +205,11 @@ void SymbolLayout::prepare(const GlyphMap& glyphMap, const GlyphPositions& glyph const Shaping result = getShaping( /* string */ text, /* maxWidth: ems */ layout.get<SymbolPlacement>() != SymbolPlacementType::Line ? - layout.get<TextMaxWidth>() * oneEm : 0, + layout.evaluate<TextMaxWidth>(zoom, feature) * oneEm : 0, /* lineHeight: ems */ layout.get<TextLineHeight>() * oneEm, /* anchor */ layout.evaluate<TextAnchor>(zoom, feature), /* justify */ layout.evaluate<TextJustify>(zoom, feature), - /* spacing: ems */ util::i18n::allowsLetterSpacing(*feature.text) ? layout.get<TextLetterSpacing>() * oneEm : 0.0f, + /* spacing: ems */ util::i18n::allowsLetterSpacing(*feature.text) ? layout.evaluate<TextLetterSpacing>(zoom, feature) * oneEm : 0.0f, /* translate */ Point<float>(layout.evaluate<TextOffset>(zoom, feature)[0] * oneEm, layout.evaluate<TextOffset>(zoom, feature)[1] * oneEm), /* verticalHeight */ oneEm, /* writingMode */ writingMode, |