diff options
| author | Lauren Budorick <lauren@mapbox.com> | 2017-07-21 12:45:05 -0700 |
|---|---|---|
| committer | Lauren Budorick <lauren@mapbox.com> | 2017-07-26 12:16:40 -0700 |
| commit | f6b8a4df99fddfae919bd884d4fbf635de6f23d6 (patch) | |
| tree | cc909b5998db56dae4a652d8c0f5840118eb2f11 /include | |
| parent | c5a5b4083795107b7df7bab39b461568a3861dba (diff) | |
| download | qtlocation-mapboxgl-f6b8a4df99fddfae919bd884d4fbf635de6f23d6.tar.gz | |
[core] implement property functions for line-join
Diffstat (limited to 'include')
| -rw-r--r-- | include/mbgl/style/conversion/make_property_setters.hpp | 2 | ||||
| -rw-r--r-- | include/mbgl/style/layers/line_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 f29d5f5b6f..f5d7f1874b 100644 --- a/include/mbgl/style/conversion/make_property_setters.hpp +++ b/include/mbgl/style/conversion/make_property_setters.hpp @@ -26,7 +26,7 @@ auto makeLayoutPropertySetters() { result["line-cap"] = &setProperty<V, LineLayer, PropertyValue<LineCapType>, &LineLayer::setLineCap>; - result["line-join"] = &setProperty<V, LineLayer, PropertyValue<LineJoinType>, &LineLayer::setLineJoin>; + result["line-join"] = &setProperty<V, LineLayer, DataDrivenPropertyValue<LineJoinType>, &LineLayer::setLineJoin>; result["line-miter-limit"] = &setProperty<V, LineLayer, PropertyValue<float>, &LineLayer::setLineMiterLimit>; result["line-round-limit"] = &setProperty<V, LineLayer, PropertyValue<float>, &LineLayer::setLineRoundLimit>; diff --git a/include/mbgl/style/layers/line_layer.hpp b/include/mbgl/style/layers/line_layer.hpp index 0b49690fd8..4519296323 100644 --- a/include/mbgl/style/layers/line_layer.hpp +++ b/include/mbgl/style/layers/line_layer.hpp @@ -42,9 +42,9 @@ public: PropertyValue<LineCapType> getLineCap() const; void setLineCap(PropertyValue<LineCapType>); - static PropertyValue<LineJoinType> getDefaultLineJoin(); - PropertyValue<LineJoinType> getLineJoin() const; - void setLineJoin(PropertyValue<LineJoinType>); + static DataDrivenPropertyValue<LineJoinType> getDefaultLineJoin(); + DataDrivenPropertyValue<LineJoinType> getLineJoin() const; + void setLineJoin(DataDrivenPropertyValue<LineJoinType>); static PropertyValue<float> getDefaultLineMiterLimit(); PropertyValue<float> getLineMiterLimit() const; |