diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-03-30 16:02:59 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-03-31 13:26:27 -0700 |
| commit | 743d95405363e0eea1b80e8c28bde245211f7868 (patch) | |
| tree | 98cc6ab0a8980916ca704efd887a029a40d05d0e /include | |
| parent | c4f9582bfa9be832eb2eb349249918db8b867ec9 (diff) | |
| download | qtlocation-mapboxgl-743d95405363e0eea1b80e8c28bde245211f7868.tar.gz | |
[core] Add DDS support for text-rotate
Diffstat (limited to 'include')
| -rw-r--r-- | include/mbgl/style/conversion/make_property_setters.hpp | 2 | ||||
| -rw-r--r-- | include/mbgl/style/layers/symbol_layer.hpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/mbgl/style/conversion/make_property_setters.hpp b/include/mbgl/style/conversion/make_property_setters.hpp index 2f26fe75c4..78c2fabebc 100644 --- a/include/mbgl/style/conversion/make_property_setters.hpp +++ b/include/mbgl/style/conversion/make_property_setters.hpp @@ -56,7 +56,7 @@ auto makeLayoutPropertySetters() { result["text-justify"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<TextJustifyType>, &SymbolLayer::setTextJustify>; result["text-anchor"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<TextAnchorType>, &SymbolLayer::setTextAnchor>; result["text-max-angle"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<float>, &SymbolLayer::setTextMaxAngle>; - result["text-rotate"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<float>, &SymbolLayer::setTextRotate>; + result["text-rotate"] = &setLayoutProperty<V, SymbolLayer, DataDrivenPropertyValue<float>, &SymbolLayer::setTextRotate>; result["text-padding"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<float>, &SymbolLayer::setTextPadding>; result["text-keep-upright"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<bool>, &SymbolLayer::setTextKeepUpright>; result["text-transform"] = &setLayoutProperty<V, SymbolLayer, DataDrivenPropertyValue<TextTransformType>, &SymbolLayer::setTextTransform>; diff --git a/include/mbgl/style/layers/symbol_layer.hpp b/include/mbgl/style/layers/symbol_layer.hpp index b507c992f5..23bdf303b6 100644 --- a/include/mbgl/style/layers/symbol_layer.hpp +++ b/include/mbgl/style/layers/symbol_layer.hpp @@ -135,9 +135,9 @@ public: PropertyValue<float> getTextMaxAngle() const; void setTextMaxAngle(PropertyValue<float>); - static PropertyValue<float> getDefaultTextRotate(); - PropertyValue<float> getTextRotate() const; - void setTextRotate(PropertyValue<float>); + static DataDrivenPropertyValue<float> getDefaultTextRotate(); + DataDrivenPropertyValue<float> getTextRotate() const; + void setTextRotate(DataDrivenPropertyValue<float>); static PropertyValue<float> getDefaultTextPadding(); PropertyValue<float> getTextPadding() const; |