diff options
| author | Minh Nguyễn <mxn@1ec5.org> | 2017-02-10 16:57:48 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-02-10 18:57:48 -0600 |
| commit | e6c15d0f6f285bc604c0d93381b9b1d3957cb5c9 (patch) | |
| tree | fefef07141b72a96d12f6ff788c8727b20420bab /src/mbgl/layout/symbol_instance.hpp | |
| parent | 0bbc6b814cbec44be7026a0bac83d56e4d71a287 (diff) | |
| download | qtlocation-mapboxgl-e6c15d0f6f285bc604c0d93381b9b1d3957cb5c9.tar.gz | |
Upright CJK characters in vertically-oriented labels (#7114)
CJK characters and adjacent punctuation now remain upright in vertically oriented labels that have line placement.
Fixes #1682.
Diffstat (limited to 'src/mbgl/layout/symbol_instance.hpp')
| -rw-r--r-- | src/mbgl/layout/symbol_instance.hpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mbgl/layout/symbol_instance.hpp b/src/mbgl/layout/symbol_instance.hpp index 508c11a394..014e34cb78 100644 --- a/src/mbgl/layout/symbol_instance.hpp +++ b/src/mbgl/layout/symbol_instance.hpp @@ -1,6 +1,7 @@ #pragma once #include <mbgl/text/quads.hpp> +#include <mbgl/text/glyph.hpp> #include <mbgl/text/collision_feature.hpp> #include <mbgl/style/layers/symbol_layer_properties.hpp> @@ -12,7 +13,7 @@ class IndexedSubfeature; class SymbolInstance { public: explicit SymbolInstance(Anchor& anchor, const GeometryCoordinates& line, - const Shaping& shapedText, const PositionedIcon& shapedIcon, + const std::pair<Shaping, Shaping>& shapedTextOrientations, const PositionedIcon& shapedIcon, const style::SymbolLayoutProperties::Evaluated&, const bool inside, const uint32_t index, const float textBoxScale, const float textPadding, style::SymbolPlacementType textPlacement, const float iconBoxScale, const float iconPadding, style::SymbolPlacementType iconPlacement, @@ -26,6 +27,7 @@ public: SymbolQuads iconQuads; CollisionFeature textCollisionFeature; CollisionFeature iconCollisionFeature; + WritingModeType writingModes; }; } // namespace mbgl |