summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2015-07-14 10:49:52 -0700
committerMinh Nguyễn <mxn@1ec5.org>2015-07-14 10:49:52 -0700
commit1f78d285160785c8c8fff3806b38f3ae9d0e312d (patch)
tree61ce13f60aef7c85bce892fa15f14abfc84c39bd /include
parentbef3e1590b38217d71cb519b2304d52efa5885fe (diff)
parentf5e38ee21a0d6db9e7d21bf4e904b5e76789c9bd (diff)
downloadqtlocation-mapboxgl-1f78d285160785c8c8fff3806b38f3ae9d0e312d.tar.gz
Merge branch 'release-v0.5.0'
Diffstat (limited to 'include')
-rw-r--r--include/mbgl/map/map.hpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
index d31d6a2757..82aef65b65 100644
--- a/include/mbgl/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -67,7 +67,10 @@ public:
void renderStill(StillImageCallback callback);
// Triggers a synchronous or asynchronous render.
- void renderSync();
+ bool renderSync();
+
+ // Nudges transitions one step, possibly notifying of the need for a rerender.
+ void nudgeTransitions(bool forceRerender);
// Notifies the Map thread that the state has changed and an update might be necessary.
void update(Update update = Update::Nothing);