diff options
author | Minh Nguyễn <mxn@1ec5.org> | 2015-07-14 10:49:52 -0700 |
---|---|---|
committer | Minh Nguyễn <mxn@1ec5.org> | 2015-07-14 10:49:52 -0700 |
commit | 1f78d285160785c8c8fff3806b38f3ae9d0e312d (patch) | |
tree | 61ce13f60aef7c85bce892fa15f14abfc84c39bd /src/mbgl/map/map.cpp | |
parent | bef3e1590b38217d71cb519b2304d52efa5885fe (diff) | |
parent | f5e38ee21a0d6db9e7d21bf4e904b5e76789c9bd (diff) | |
download | qtlocation-mapboxgl-1f78d285160785c8c8fff3806b38f3ae9d0e312d.tar.gz |
Merge branch 'release-v0.5.0'
Diffstat (limited to 'src/mbgl/map/map.cpp')
-rw-r--r-- | src/mbgl/map/map.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index 0e58a2912d..d983a9c518 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -48,7 +48,7 @@ void Map::renderStill(StillImageCallback callback) { FrameData{ view.getFramebufferSize() }, callback); } -void Map::renderSync() { +bool Map::renderSync() { if (renderState == RenderState::never) { view.notifyMapChange(MapChangeWillStartRenderingMap); } @@ -69,9 +69,13 @@ void Map::renderSync() { view.notifyMapChange(MapChangeDidFinishRenderingMapFullyRendered); } + return result.needsRerender; +} + +void Map::nudgeTransitions(bool forceRerender) { if (transform->needsTransition()) { update(Update(transform->updateTransitions(Clock::now()))); - } else if (result.needsRerender) { + } else if (forceRerender) { update(); } } |