diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2015-07-14 18:47:46 +0300 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2015-07-21 18:02:09 +0300 |
| commit | 38f3bed63ece0214d02a755991ee7f1d7b54ba10 (patch) | |
| tree | 439bc63adef8f7759f6002b8065c06e0df8b8295 | |
| parent | 0b8cd02c195e58ae11037e3905f4987f7ce05bbb (diff) | |
| download | qtlocation-mapboxgl-38f3bed63ece0214d02a755991ee7f1d7b54ba10.tar.gz | |
Export default transition delay in Map public API
Added a setter/getter for default transition delay, in the same fashion
as the default transition duration.
Spin-off from #1888. Fixes #302.
| -rw-r--r-- | include/mbgl/map/map.hpp | 4 | ||||
| -rw-r--r-- | include/mbgl/map/update.hpp | 2 | ||||
| -rw-r--r-- | src/mbgl/map/map.cpp | 11 | ||||
| -rw-r--r-- | src/mbgl/map/map_context.cpp | 2 |
4 files changed, 16 insertions, 3 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index 82aef65b65..6e24d177a9 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -84,6 +84,10 @@ public: void setDefaultTransitionDuration(const Duration& = Duration::zero()); Duration getDefaultTransitionDuration() const; + + void setDefaultTransitionDelay(const Duration& = Duration::zero()); + Duration getDefaultTransitionDelay() const; + void setStyleURL(const std::string& url); void setStyleJSON(const std::string& json, const std::string& base = ""); std::string getStyleURL() const; diff --git a/include/mbgl/map/update.hpp b/include/mbgl/map/update.hpp index 40cc1bc2bc..d2d6133bc2 100644 --- a/include/mbgl/map/update.hpp +++ b/include/mbgl/map/update.hpp @@ -10,7 +10,7 @@ using UpdateType = uint32_t; enum class Update : UpdateType { Nothing = 0, Dimensions = 1 << 1, - DefaultTransitionDuration = 1 << 2, + DefaultTransition = 1 << 2, Classes = 1 << 3, Zoom = 1 << 4, RenderStill = 1 << 5, diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index d983a9c518..5b96b83199 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -422,13 +422,22 @@ std::vector<std::string> Map::getClasses() const { void Map::setDefaultTransitionDuration(const Duration& duration) { data->setDefaultTransitionDuration(duration); - update(Update::DefaultTransitionDuration); + update(Update::DefaultTransition); } Duration Map::getDefaultTransitionDuration() const { return data->getDefaultTransitionDuration(); } +void Map::setDefaultTransitionDelay(const Duration& delay) { + data->setDefaultTransitionDelay(delay); + update(Update::DefaultTransition); +} + +Duration Map::getDefaultTransitionDelay() const { + return data->getDefaultTransitionDelay(); +} + void Map::setSourceTileCacheSize(size_t size) { context->invoke(&MapContext::setSourceTileCacheSize, size); } diff --git a/src/mbgl/map/map_context.cpp b/src/mbgl/map/map_context.cpp index 169bd7b9c6..1a03c9330c 100644 --- a/src/mbgl/map/map_context.cpp +++ b/src/mbgl/map/map_context.cpp @@ -136,7 +136,7 @@ void MapContext::loadStyleJSON(const std::string& json, const std::string& base) // force style cascade, causing all pending transitions to complete. style->cascade(); - updated |= static_cast<UpdateType>(Update::DefaultTransitionDuration); + updated |= static_cast<UpdateType>(Update::DefaultTransition); updated |= static_cast<UpdateType>(Update::Classes); updated |= static_cast<UpdateType>(Update::Zoom); asyncUpdate->send(); |