diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-08-21 18:48:09 +0300 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-08-23 10:56:05 +0300 |
commit | ef3d04dee5f4bc23a9fa88a07805c3d5c489db0b (patch) | |
tree | 3b21767ffabdf00f454e339d70a02625de199369 /platform | |
parent | 7b25cb10921c7711cf5ba997e674bea5a1da31ca (diff) | |
download | qtlocation-mapboxgl-ef3d04dee5f4bc23a9fa88a07805c3d5c489db0b.tar.gz |
[core] Export symbol placement update status from MapObserver
Diffstat (limited to 'platform')
-rw-r--r-- | platform/android/src/android_renderer_frontend.cpp | 4 | ||||
-rwxr-xr-x | platform/android/src/native_map_view.cpp | 2 | ||||
-rwxr-xr-x | platform/android/src/native_map_view.hpp | 2 | ||||
-rw-r--r-- | platform/ios/src/MGLMapView+Impl.h | 2 | ||||
-rw-r--r-- | platform/ios/src/MGLMapView+Impl.mm | 2 | ||||
-rw-r--r-- | platform/macos/src/MGLMapView+Impl.h | 2 | ||||
-rw-r--r-- | platform/macos/src/MGLMapView+Impl.mm | 2 | ||||
-rw-r--r-- | platform/qt/src/qmapboxgl_map_observer.cpp | 2 | ||||
-rw-r--r-- | platform/qt/src/qmapboxgl_map_observer.hpp | 2 | ||||
-rw-r--r-- | platform/qt/src/qmapboxgl_renderer_observer.hpp | 4 |
10 files changed, 12 insertions, 12 deletions
diff --git a/platform/android/src/android_renderer_frontend.cpp b/platform/android/src/android_renderer_frontend.cpp index 6862fabcb4..d1a2624f0d 100644 --- a/platform/android/src/android_renderer_frontend.cpp +++ b/platform/android/src/android_renderer_frontend.cpp @@ -42,8 +42,8 @@ public: delegate.invoke(&RendererObserver::onWillStartRenderingFrame); } - void onDidFinishRenderingFrame(RenderMode mode, bool repaintNeeded) override { - delegate.invoke(&RendererObserver::onDidFinishRenderingFrame, mode, repaintNeeded); + void onDidFinishRenderingFrame(RenderMode mode, bool repaintNeeded, bool placementChanged) override { + delegate.invoke(&RendererObserver::onDidFinishRenderingFrame, mode, repaintNeeded, placementChanged); } void onDidFinishRenderingMap() override { diff --git a/platform/android/src/native_map_view.cpp b/platform/android/src/native_map_view.cpp index 48b65c4c02..e94ef0153e 100755 --- a/platform/android/src/native_map_view.cpp +++ b/platform/android/src/native_map_view.cpp @@ -185,7 +185,7 @@ void NativeMapView::onWillStartRenderingFrame() { } } -void NativeMapView::onDidFinishRenderingFrame(MapObserver::RenderMode mode) { +void NativeMapView::onDidFinishRenderingFrame(MapObserver::RenderMode mode, bool) { assert(vm != nullptr); android::UniqueEnv _env = android::AttachEnv(); diff --git a/platform/android/src/native_map_view.hpp b/platform/android/src/native_map_view.hpp index 4ea4781b36..10b2af0669 100755 --- a/platform/android/src/native_map_view.hpp +++ b/platform/android/src/native_map_view.hpp @@ -62,7 +62,7 @@ public: void onDidFinishLoadingMap() override; void onDidFailLoadingMap(MapLoadError, const std::string&) override; void onWillStartRenderingFrame() override; - void onDidFinishRenderingFrame(MapObserver::RenderMode) override; + void onDidFinishRenderingFrame(MapObserver::RenderMode, bool) override; void onWillStartRenderingMap() override; void onDidFinishRenderingMap(MapObserver::RenderMode) override; void onDidBecomeIdle() override; diff --git a/platform/ios/src/MGLMapView+Impl.h b/platform/ios/src/MGLMapView+Impl.h index 0a62b7da82..66dc408274 100644 --- a/platform/ios/src/MGLMapView+Impl.h +++ b/platform/ios/src/MGLMapView+Impl.h @@ -62,7 +62,7 @@ public: void onDidFinishLoadingMap() override; void onDidFailLoadingMap(mbgl::MapLoadError mapError, const std::string& what) override; void onWillStartRenderingFrame() override; - void onDidFinishRenderingFrame(mbgl::MapObserver::RenderMode) override; + void onDidFinishRenderingFrame(mbgl::MapObserver::RenderMode, bool) override; void onWillStartRenderingMap() override; void onDidFinishRenderingMap(mbgl::MapObserver::RenderMode) override; void onDidFinishLoadingStyle() override; diff --git a/platform/ios/src/MGLMapView+Impl.mm b/platform/ios/src/MGLMapView+Impl.mm index 1bccfa662f..76c9c0f9ba 100644 --- a/platform/ios/src/MGLMapView+Impl.mm +++ b/platform/ios/src/MGLMapView+Impl.mm @@ -68,7 +68,7 @@ void MGLMapViewImpl::onWillStartRenderingFrame() { [mapView mapViewWillStartRenderingFrame]; } -void MGLMapViewImpl::onDidFinishRenderingFrame(mbgl::MapObserver::RenderMode mode) { +void MGLMapViewImpl::onDidFinishRenderingFrame(mbgl::MapObserver::RenderMode mode, bool) { bool fullyRendered = mode == mbgl::MapObserver::RenderMode::Full; [mapView mapViewDidFinishRenderingFrameFullyRendered:fullyRendered]; } diff --git a/platform/macos/src/MGLMapView+Impl.h b/platform/macos/src/MGLMapView+Impl.h index 2d523716d4..de235fa147 100644 --- a/platform/macos/src/MGLMapView+Impl.h +++ b/platform/macos/src/MGLMapView+Impl.h @@ -30,7 +30,7 @@ public: void onDidFinishLoadingMap() override; void onDidFailLoadingMap(mbgl::MapLoadError mapError, const std::string& what) override; void onWillStartRenderingFrame() override; - void onDidFinishRenderingFrame(mbgl::MapObserver::RenderMode) override; + void onDidFinishRenderingFrame(mbgl::MapObserver::RenderMode, bool /*placementChanged*/) override; void onWillStartRenderingMap() override; void onDidFinishRenderingMap(mbgl::MapObserver::RenderMode) override; void onDidFinishLoadingStyle() override; diff --git a/platform/macos/src/MGLMapView+Impl.mm b/platform/macos/src/MGLMapView+Impl.mm index 2354f67a6d..1ed5e2ceef 100644 --- a/platform/macos/src/MGLMapView+Impl.mm +++ b/platform/macos/src/MGLMapView+Impl.mm @@ -67,7 +67,7 @@ void MGLMapViewImpl::onWillStartRenderingFrame() { [mapView mapViewWillStartRenderingFrame]; } -void MGLMapViewImpl::onDidFinishRenderingFrame(mbgl::MapObserver::RenderMode mode) { +void MGLMapViewImpl::onDidFinishRenderingFrame(mbgl::MapObserver::RenderMode mode, bool) { bool fullyRendered = mode == mbgl::MapObserver::RenderMode::Full; [mapView mapViewDidFinishRenderingFrameFullyRendered:fullyRendered]; } diff --git a/platform/qt/src/qmapboxgl_map_observer.cpp b/platform/qt/src/qmapboxgl_map_observer.cpp index 4a842026cd..7d2af08cc4 100644 --- a/platform/qt/src/qmapboxgl_map_observer.cpp +++ b/platform/qt/src/qmapboxgl_map_observer.cpp @@ -77,7 +77,7 @@ void QMapboxGLMapObserver::onWillStartRenderingFrame() emit mapChanged(QMapboxGL::MapChangeWillStartRenderingFrame); } -void QMapboxGLMapObserver::onDidFinishRenderingFrame(mbgl::MapObserver::RenderMode mode) +void QMapboxGLMapObserver::onDidFinishRenderingFrame(mbgl::MapObserver::RenderMode mode, bool) { if (mode == mbgl::MapObserver::RenderMode::Partial) { emit mapChanged(QMapboxGL::MapChangeDidFinishRenderingFrame); diff --git a/platform/qt/src/qmapboxgl_map_observer.hpp b/platform/qt/src/qmapboxgl_map_observer.hpp index a12e5e9c70..1620c1ef87 100644 --- a/platform/qt/src/qmapboxgl_map_observer.hpp +++ b/platform/qt/src/qmapboxgl_map_observer.hpp @@ -28,7 +28,7 @@ public: void onDidFinishLoadingMap() final; void onDidFailLoadingMap(mbgl::MapLoadError, const std::string&) final; void onWillStartRenderingFrame() final; - void onDidFinishRenderingFrame(mbgl::MapObserver::RenderMode) final; + void onDidFinishRenderingFrame(mbgl::MapObserver::RenderMode, bool /*placementChanged*/) final; void onWillStartRenderingMap() final; void onDidFinishRenderingMap(mbgl::MapObserver::RenderMode) final; void onDidFinishLoadingStyle() final; diff --git a/platform/qt/src/qmapboxgl_renderer_observer.hpp b/platform/qt/src/qmapboxgl_renderer_observer.hpp index ee340113ff..78dd6b91d6 100644 --- a/platform/qt/src/qmapboxgl_renderer_observer.hpp +++ b/platform/qt/src/qmapboxgl_renderer_observer.hpp @@ -37,8 +37,8 @@ public: delegate.invoke(&mbgl::RendererObserver::onWillStartRenderingFrame); } - void onDidFinishRenderingFrame(RenderMode mode, bool repaintNeeded) final { - delegate.invoke(&mbgl::RendererObserver::onDidFinishRenderingFrame, mode, repaintNeeded); + void onDidFinishRenderingFrame(RenderMode mode, bool repaintNeeded, bool placementChanged) final { + delegate.invoke(&mbgl::RendererObserver::onDidFinishRenderingFrame, mode, repaintNeeded, placementChanged); } void onDidFinishRenderingMap() final { |