diff options
| author | Young Hahn <young@mapbox.com> | 2016-06-15 17:13:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-15 17:13:31 -0400 |
| commit | 199ea2a82a74cf2f7b63078e2dd4b8274c061851 (patch) | |
| tree | 5d56478a020a911745d793b8ac5d7f236730c621 /include | |
| parent | a020e535cac36d69a8939fb7956260d2217c65b4 (diff) | |
| download | qtlocation-mapboxgl-199ea2a82a74cf2f7b63078e2dd4b8274c061851.tar.gz | |
Support for icon-text-fit, icon-text-fit-padding (#5334)
* Add support for icon-text-fit
* Port unit tests for getIconQuads() from js => cpp
* Add support for padding in all 4 directions.
* Update all hashes post-merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/mbgl/style/layers/symbol_layer.hpp | 6 | ||||
| -rw-r--r-- | include/mbgl/style/types.hpp | 7 |
2 files changed, 13 insertions, 0 deletions
diff --git a/include/mbgl/style/layers/symbol_layer.hpp b/include/mbgl/style/layers/symbol_layer.hpp index 676d90d5b9..7d98a5ef6b 100644 --- a/include/mbgl/style/layers/symbol_layer.hpp +++ b/include/mbgl/style/layers/symbol_layer.hpp @@ -53,6 +53,12 @@ public: PropertyValue<float> getIconSize() const; void setIconSize(PropertyValue<float>); + PropertyValue<IconTextFitType> getIconTextFit() const; + void setIconTextFit(PropertyValue<IconTextFitType>); + + PropertyValue<std::array<float, 4>> getIconTextFitPadding() const; + void setIconTextFitPadding(PropertyValue<std::array<float, 4>>); + PropertyValue<std::string> getIconImage() const; void setIconImage(PropertyValue<std::string>); diff --git a/include/mbgl/style/types.hpp b/include/mbgl/style/types.hpp index 46c0cb3c39..28ebda9fb9 100644 --- a/include/mbgl/style/types.hpp +++ b/include/mbgl/style/types.hpp @@ -80,5 +80,12 @@ enum class TextTransformType : uint8_t { Lowercase, }; +enum class IconTextFitType : uint8_t { + None, + Both, + Width, + Height +}; + } // namespace style } // namespace mbgl |