summaryrefslogtreecommitdiff
path: root/platform/macos
diff options
context:
space:
mode:
authorIvo van Dongen <info@ivovandongen.nl>2017-06-13 10:50:16 +0300
committerIvo van Dongen <ivovandongen@users.noreply.github.com>2017-07-18 10:45:12 +0200
commit39a732d7ae3cb1b927d94c4b1154b42d9565356a (patch)
tree5f33317467cb3dbdf19be3a8264818ff34f859eb /platform/macos
parent57351c068b133ed140ac7b991181672019fe5c24 (diff)
downloadqtlocation-mapboxgl-39a732d7ae3cb1b927d94c4b1154b42d9565356a.tar.gz
[android][glfw][ios][macos][node][qt] split backend from mapobserver
Diffstat (limited to 'platform/macos')
-rw-r--r--platform/macos/src/MGLMapView.mm4
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/macos/src/MGLMapView.mm b/platform/macos/src/MGLMapView.mm
index 70198c6432..7efe8a463d 100644
--- a/platform/macos/src/MGLMapView.mm
+++ b/platform/macos/src/MGLMapView.mm
@@ -270,7 +270,7 @@ public:
mbgl::DefaultFileSource* mbglFileSource = [MGLOfflineStorage sharedOfflineStorage].mbglFileSource;
_mbglThreadPool = mbgl::sharedThreadPool();
- _mbglMap = new mbgl::Map(*_mbglView, self.size, [NSScreen mainScreen].backingScaleFactor, *mbglFileSource, *_mbglThreadPool, mbgl::MapMode::Continuous, mbgl::GLContextMode::Unique, mbgl::ConstrainMode::None, mbgl::ViewportMode::Default);
+ _mbglMap = new mbgl::Map(*_mbglView, *_mbglView, self.size, [NSScreen mainScreen].backingScaleFactor, *mbglFileSource, *_mbglThreadPool, mbgl::MapMode::Continuous, mbgl::GLContextMode::Unique, mbgl::ConstrainMode::None, mbgl::ViewportMode::Default);
// Install the OpenGL layer. Interface Builder’s synchronous drawing means
// we can’t display a map, so don’t even bother to have a map layer.
@@ -2756,7 +2756,7 @@ public:
}
/// Adapter responsible for bridging calls from mbgl to MGLMapView and Cocoa.
-class MGLMapViewImpl : public mbgl::View, public mbgl::Backend {
+class MGLMapViewImpl : public mbgl::View, public mbgl::Backend, public mbgl::MapObserver {
public:
MGLMapViewImpl(MGLMapView *nativeView_)
: nativeView(nativeView_) {}