summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2015-07-14 18:47:46 +0300
committerBruno de Oliveira Abinader <bruno@mapbox.com>2015-07-21 18:02:09 +0300
commit38f3bed63ece0214d02a755991ee7f1d7b54ba10 (patch)
tree439bc63adef8f7759f6002b8065c06e0df8b8295 /src
parent0b8cd02c195e58ae11037e3905f4987f7ce05bbb (diff)
downloadqtlocation-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.
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/map/map.cpp11
-rw-r--r--src/mbgl/map/map_context.cpp2
2 files changed, 11 insertions, 2 deletions
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();