diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2015-11-09 17:21:17 +0200 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2015-11-10 10:28:16 +0200 |
commit | 41120774af3af5d01cff689fbc61135252c1f575 (patch) | |
tree | 61c10b0cb2bd5bace71e6628513c79a4f56f44f7 | |
parent | f5a058640884714ae3ff1e1ed9eb75b0ffdb22b3 (diff) | |
download | qtlocation-mapboxgl-41120774af3af5d01cff689fbc61135252c1f575.tar.gz |
[core] Expose default fade duration to Map API
-rw-r--r-- | include/mbgl/map/map.hpp | 7 | ||||
-rw-r--r-- | src/mbgl/map/map.cpp | 9 |
2 files changed, 14 insertions, 2 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index 6851520bfa..116722125b 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -73,10 +73,13 @@ public: void setClasses(const std::vector<std::string>&); std::vector<std::string> getClasses() const; - void setDefaultTransitionDuration(const Duration& = Duration::zero()); + void setDefaultFadeDuration(const Duration&); + Duration getDefaultFadeDuration() const; + + void setDefaultTransitionDuration(const Duration&); Duration getDefaultTransitionDuration() const; - void setDefaultTransitionDelay(const Duration& = Duration::zero()); + void setDefaultTransitionDelay(const Duration&); Duration getDefaultTransitionDelay() const; void setStyleURL(const std::string& url); diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index bca8b1edee..65fe66cab2 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -474,6 +474,15 @@ std::vector<std::string> Map::getClasses() const { return data->getClasses(); } +void Map::setDefaultFadeDuration(const Duration& duration) { + data->setDefaultFadeDuration(duration); + update(Update::Classes); +} + +Duration Map::getDefaultFadeDuration() const { + return data->getDefaultFadeDuration(); +} + void Map::setDefaultTransitionDuration(const Duration& duration) { data->setDefaultTransitionDuration(duration); update(Update::DefaultTransition); |