summaryrefslogtreecommitdiff
path: root/include
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 /include
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 'include')
-rw-r--r--include/mbgl/map/map.hpp4
-rw-r--r--include/mbgl/map/update.hpp2
2 files changed, 5 insertions, 1 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,