diff options
| author | Lauren Budorick <lauren@mapbox.com> | 2017-08-23 15:03:15 -0700 |
|---|---|---|
| committer | Lauren Budorick <lauren@mapbox.com> | 2017-08-28 12:42:51 -0700 |
| commit | be18e6a9bdf0b5cad38c4bab6fa391cff49d6dfd (patch) | |
| tree | e930ceb8436646e0d6747f2b3e805bd640f2a436 /src/mbgl/text/shaping.hpp | |
| parent | c6ab20e5c69c3705422e49c3511faf3e5ab79b05 (diff) | |
| download | qtlocation-mapboxgl-upstream/icon-anchor.tar.gz | |
Implement icon-anchor propertyupstream/icon-anchor
Diffstat (limited to 'src/mbgl/text/shaping.hpp')
| -rw-r--r-- | src/mbgl/text/shaping.hpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mbgl/text/shaping.hpp b/src/mbgl/text/shaping.hpp index 00e4ec55f8..0a961849e5 100644 --- a/src/mbgl/text/shaping.hpp +++ b/src/mbgl/text/shaping.hpp @@ -32,7 +32,10 @@ private: float _angle; public: - static PositionedIcon shapeIcon(const ImagePosition&, const std::array<float, 2>& iconOffset, const float iconRotation); + static PositionedIcon shapeIcon(const ImagePosition&, + const std::array<float, 2>& iconOffset, + style::SymbolAnchorType iconAnchor, + const float iconRotation); const ImagePosition& image() const { return _image; } float top() const { return _top; } @@ -45,7 +48,7 @@ public: const Shaping getShaping(const std::u16string& string, float maxWidth, float lineHeight, - style::TextAnchorType textAnchor, + style::SymbolAnchorType textAnchor, style::TextJustifyType textJustify, float spacing, const Point<float>& translate, |