diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2018-10-03 17:00:28 -0700 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2018-11-21 16:43:20 +0200 |
commit | 594d2074a3849d141219c04cdde739f86e7256b3 (patch) | |
tree | 0c7c0c5bd549b47e3b0c248d8412fa9c79c9504c /include/mbgl | |
parent | 5fb0b0c1bc2dbde473742ab281706abff2b24217 (diff) | |
download | qtlocation-mapboxgl-594d2074a3849d141219c04cdde739f86e7256b3.tar.gz |
[core] Let placement transitions use the transition duration, if set, and allow disabling them entirely
Diffstat (limited to 'include/mbgl')
-rw-r--r-- | include/mbgl/style/transition_options.hpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/mbgl/style/transition_options.hpp b/include/mbgl/style/transition_options.hpp index 87a81717a0..9cb5c1f575 100644 --- a/include/mbgl/style/transition_options.hpp +++ b/include/mbgl/style/transition_options.hpp @@ -10,16 +10,20 @@ class TransitionOptions { public: optional<Duration> duration; optional<Duration> delay; + bool enablePlacementTransitions; TransitionOptions(optional<Duration> duration_ = {}, - optional<Duration> delay_ = {}) + optional<Duration> delay_ = {}, + bool enablePlacementTransitions_ = true) : duration(std::move(duration_)), - delay(std::move(delay_)) {} + delay(std::move(delay_)), + enablePlacementTransitions(enablePlacementTransitions_) {} TransitionOptions reverseMerge(const TransitionOptions& defaults) const { return { duration ? duration : defaults.duration, - delay ? delay : defaults.delay + delay ? delay : defaults.delay, + enablePlacementTransitions }; } |