diff options
| author | Anand Thakker <anandthakker@users.noreply.github.com> | 2017-04-06 15:29:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-06 15:29:59 -0400 |
| commit | 693c9f3641b3189b4cd439049904c95a516ae609 (patch) | |
| tree | 8341a16f57ff184a2fe9e085c490e8762eb206ce /src/mbgl/style/layers/symbol_layer_properties.hpp | |
| parent | f9cc044357d60dd5cf15ba951384529f88802089 (diff) | |
| download | qtlocation-mapboxgl-693c9f3641b3189b4cd439049904c95a516ae609.tar.gz | |
[core] Add DDS support for {text,icon}-size (#8593)
* Update gl-js and generate style code
* Factor out packUint8Pair() helper function
* Draft implementation of DDS for {text,icon}-size
Ports https://github.com/mapbox/mapbox-gl-js/pull/4455
* Fix text-size/composite-function-line-placement test
* Refactor to PaintPropertyBinders-like strategy
* Dedupe gl::Program construction
* Use exponential function base for interpolation
* Dedupe coveringZoomStops method
* Fixup tests
* Fix CI errors (hidden within #if block)
Diffstat (limited to 'src/mbgl/style/layers/symbol_layer_properties.hpp')
| -rw-r--r-- | src/mbgl/style/layers/symbol_layer_properties.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/style/layers/symbol_layer_properties.hpp b/src/mbgl/style/layers/symbol_layer_properties.hpp index 4f63ed419a..42f593890b 100644 --- a/src/mbgl/style/layers/symbol_layer_properties.hpp +++ b/src/mbgl/style/layers/symbol_layer_properties.hpp @@ -45,7 +45,7 @@ struct IconRotationAlignment : LayoutProperty<AlignmentType> { static AlignmentType defaultValue() { return AlignmentType::Auto; } }; -struct IconSize : LayoutProperty<float> { +struct IconSize : DataDrivenLayoutProperty<float> { static constexpr const char * key = "icon-size"; static float defaultValue() { return 1; } }; @@ -105,7 +105,7 @@ struct TextFont : LayoutProperty<std::vector<std::string>> { static std::vector<std::string> defaultValue() { return { "Open Sans Regular", "Arial Unicode MS Regular" }; } }; -struct TextSize : LayoutProperty<float> { +struct TextSize : DataDrivenLayoutProperty<float> { static constexpr const char * key = "text-size"; static float defaultValue() { return 16; } }; |