diff options
author | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2019-08-08 13:56:22 +0300 |
---|---|---|
committer | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2019-08-20 12:31:02 +0300 |
commit | 9ba700fd47cccb3b615afae0b4b309c1e69da2f7 (patch) | |
tree | 3f788876e2a2be9d4787d81a961b660125b5546e /src/mbgl/layout/symbol_instance.hpp | |
parent | 073a243862ce9634cd7db2a06aebbd3ac60a7402 (diff) | |
download | qtlocation-mapboxgl-9ba700fd47cccb3b615afae0b4b309c1e69da2f7.tar.gz |
[core] Fix combination of icon-text-fit with text-variable-anchors and text-writing-mode
Diffstat (limited to 'src/mbgl/layout/symbol_instance.hpp')
-rw-r--r-- | src/mbgl/layout/symbol_instance.hpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/mbgl/layout/symbol_instance.hpp b/src/mbgl/layout/symbol_instance.hpp index 2c6aad653f..60883c12db 100644 --- a/src/mbgl/layout/symbol_instance.hpp +++ b/src/mbgl/layout/symbol_instance.hpp @@ -25,8 +25,8 @@ struct SymbolInstanceSharedData { SymbolInstanceSharedData(GeometryCoordinates line, const ShapedTextOrientations& shapedTextOrientations, const optional<PositionedIcon>& shapedIcon, + const optional<PositionedIcon>& verticallyShapedIcon, const style::SymbolLayoutProperties::Evaluated& layout, - const float layoutTextSize, const style::SymbolPlacementType textPlacement, const std::array<float, 2>& textOffset, const GlyphPositions& positions, @@ -39,6 +39,7 @@ struct SymbolInstanceSharedData { SymbolQuads leftJustifiedGlyphQuads; SymbolQuads verticalGlyphQuads; optional<SymbolQuad> iconQuad; + optional<SymbolQuad> verticalIconQuad; }; class SymbolInstance { @@ -47,6 +48,7 @@ public: std::shared_ptr<SymbolInstanceSharedData> sharedData, const ShapedTextOrientations& shapedTextOrientations, const optional<PositionedIcon>& shapedIcon, + const optional<PositionedIcon>& verticallyShapedIcon, const float textBoxScale, const float textPadding, const style::SymbolPlacementType textPlacement, @@ -71,6 +73,7 @@ public: const SymbolQuads& centerJustifiedGlyphQuads() const; const SymbolQuads& verticalGlyphQuads() const; const optional<SymbolQuad>& iconQuad() const; + const optional<SymbolQuad>& verticalIconQuad() const; void releaseSharedData(); private: @@ -89,6 +92,7 @@ public: CollisionFeature textCollisionFeature; CollisionFeature iconCollisionFeature; optional<CollisionFeature> verticalTextCollisionFeature = nullopt; + optional<CollisionFeature> verticalIconCollisionFeature = nullopt; WritingModeType writingModes; std::size_t layoutFeatureIndex; // Index into the set of features included at layout time std::size_t dataFeatureIndex; // Index into the underlying tile data feature set @@ -101,6 +105,7 @@ public: optional<size_t> placedLeftTextIndex; optional<size_t> placedVerticalTextIndex; optional<size_t> placedIconIndex; + optional<size_t> placedVerticalIconIndex; float textBoxScale; float radialTextOffset; bool singleLine; |