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 /platform | |
| 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 'platform')
| -rw-r--r-- | platform/node/src/node_style.hpp | 8 | ||||
| -rw-r--r-- | platform/node/src/node_style_properties.hpp | 3 |
2 files changed, 11 insertions, 0 deletions
diff --git a/platform/node/src/node_style.hpp b/platform/node/src/node_style.hpp index 34b8b96a99..a987c0d262 100644 --- a/platform/node/src/node_style.hpp +++ b/platform/node/src/node_style.hpp @@ -79,6 +79,14 @@ struct ValueConverter<std::array<float, 2>> { }; template <> +struct ValueConverter<std::array<float, 4>> { + mbgl::optional<mbgl::style::PropertyValue<std::array<float, 4>>> operator()(const v8::Local<v8::Value>& value) const { + (void)value; + return {}; + } +}; + +template <> struct ValueConverter<std::vector<float>> { mbgl::optional<mbgl::style::PropertyValue<std::vector<float>>> operator()(const v8::Local<v8::Value>& value) const { (void)value; diff --git a/platform/node/src/node_style_properties.hpp b/platform/node/src/node_style_properties.hpp index 4702918ae1..88142f8e1f 100644 --- a/platform/node/src/node_style_properties.hpp +++ b/platform/node/src/node_style_properties.hpp @@ -27,11 +27,14 @@ inline PropertySetters makeLayoutPropertySetters() { result["icon-optional"] = makePropertySetter(&SymbolLayer::setIconOptional); result["icon-rotation-alignment"] = makePropertySetter(&SymbolLayer::setIconRotationAlignment); result["icon-size"] = makePropertySetter(&SymbolLayer::setIconSize); + result["icon-text-fit"] = makePropertySetter(&SymbolLayer::setIconTextFit); + result["icon-text-fit-padding"] = makePropertySetter(&SymbolLayer::setIconTextFitPadding); result["icon-image"] = makePropertySetter(&SymbolLayer::setIconImage); result["icon-rotate"] = makePropertySetter(&SymbolLayer::setIconRotate); result["icon-padding"] = makePropertySetter(&SymbolLayer::setIconPadding); result["icon-keep-upright"] = makePropertySetter(&SymbolLayer::setIconKeepUpright); result["icon-offset"] = makePropertySetter(&SymbolLayer::setIconOffset); + result["text-pitch-alignment"] = makePropertySetter(&SymbolLayer::setTextPitchAlignment); result["text-rotation-alignment"] = makePropertySetter(&SymbolLayer::setTextRotationAlignment); result["text-field"] = makePropertySetter(&SymbolLayer::setTextField); result["text-font"] = makePropertySetter(&SymbolLayer::setTextFont); |