diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2014-11-03 15:07:33 -0800 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2014-11-04 12:26:27 -0800 |
commit | 0790b574b43322a0ea85e6ec6488b16dc74e11ce (patch) | |
tree | d1aae5f458f0f559f957048935d775de94debcb1 /include/mbgl/style | |
parent | 9a3b740fcc76d9f245ec330093b2e1231656697f (diff) | |
download | qtlocation-mapboxgl-0790b574b43322a0ea85e6ec6488b16dc74e11ce.tar.gz |
Single text positioning property
https://github.com/mapbox/mapbox-gl-style-spec/issues/197
Diffstat (limited to 'include/mbgl/style')
-rw-r--r-- | include/mbgl/style/style_bucket.hpp | 3 | ||||
-rw-r--r-- | include/mbgl/style/types.hpp | 28 |
2 files changed, 10 insertions, 21 deletions
diff --git a/include/mbgl/style/style_bucket.hpp b/include/mbgl/style/style_bucket.hpp index c4a8f6037e..d84d35d5b2 100644 --- a/include/mbgl/style/style_bucket.hpp +++ b/include/mbgl/style/style_bucket.hpp @@ -64,8 +64,7 @@ public: float line_height = 1.2f * 24 /* em */; float letter_spacing = 0.0f * 24 /* em */; TextJustifyType justify = TextJustifyType::Center; - TextHorizontalAlignType horizontal_align = TextHorizontalAlignType::Center; - TextVerticalAlignType vertical_align = TextVerticalAlignType::Center; + TextAnchorType anchor = TextAnchorType::Center; float max_angle = 45.0f /* degrees */; float rotate = 0.0f; float slant = 0.0f; diff --git a/include/mbgl/style/types.hpp b/include/mbgl/style/types.hpp index fa21f819a5..36cb39181e 100644 --- a/include/mbgl/style/types.hpp +++ b/include/mbgl/style/types.hpp @@ -152,30 +152,20 @@ MBGL_DEFINE_ENUM_CLASS(TextJustifyTypeClass, TextJustifyType, { // ------------------------------------------------------------------------------------------------- -enum class TextHorizontalAlignType : uint8_t { - Left, +enum class TextAnchorType : uint8_t { Center, + Left, Right, -}; - -MBGL_DEFINE_ENUM_CLASS(TextHorizontalAlignTypeClass, TextHorizontalAlignType, { - { TextHorizontalAlignType::Left, "left" }, - { TextHorizontalAlignType::Center, "center" }, - { TextHorizontalAlignType::Right, "right" }, -}); - -// ------------------------------------------------------------------------------------------------- - -enum class TextVerticalAlignType : uint8_t { Top, - Center, - Bottom, + Bottom }; -MBGL_DEFINE_ENUM_CLASS(TextVerticalAlignTypeClass, TextVerticalAlignType, { - { TextVerticalAlignType::Top, "top" }, - { TextVerticalAlignType::Center, "center" }, - { TextVerticalAlignType::Bottom, "bottom" }, +MBGL_DEFINE_ENUM_CLASS(TextAnchorTypeClass, TextAnchorType, { + { TextAnchorType::Center, "center" }, + { TextAnchorType::Left, "left" }, + { TextAnchorType::Right, "right" }, + { TextAnchorType::Top, "top" }, + { TextAnchorType::Bottom, "bottom" }, }); // ------------------------------------------------------------------------------------------------- |