From 41120774af3af5d01cff689fbc61135252c1f575 Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Mon, 9 Nov 2015 17:21:17 +0200 Subject: [PATCH] [core] Expose default fade duration to Map API --- include/mbgl/map/map.hpp | 7 +++++-- 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 6851520bf..116722125 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -73,10 +73,13 @@ public: void setClasses(const std::vector&); std::vector 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 bca8b1ede..65fe66cab 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -474,6 +474,15 @@ std::vector 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);