diff options
| author | Julian Rex <julian.rex@mapbox.com> | 2019-04-02 11:35:24 -0400 |
|---|---|---|
| committer | Julian Rex <julian.rex@mapbox.com> | 2019-04-02 11:35:24 -0400 |
| commit | 53764bc122458f1b9b7f850f64f3da0041058506 (patch) | |
| tree | 13cab71071ccf2794782ea938e51408f7be52667 | |
| parent | ffc7948fabff4a9e4aa1c0b6afe59467f66bd234 (diff) | |
| download | qtlocation-mapboxgl-upstream/jrex/partial-revert-12895.tar.gz | |
Partial revert of 12895: remove presentsWithTransaction, disable implicit actionsupstream/jrex/partial-revert-12895
| -rw-r--r-- | platform/ios/src/MGLMapView.mm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm index bf2421521f..2cf104913b 100644 --- a/platform/ios/src/MGLMapView.mm +++ b/platform/ios/src/MGLMapView.mm @@ -695,9 +695,6 @@ public: _glView.layer.opaque = _opaque; _glView.delegate = self; - CAEAGLLayer *eaglLayer = MGL_OBJC_DYNAMIC_CAST(_glView.layer, CAEAGLLayer); - eaglLayer.presentsWithTransaction = YES; - [_glView bindDrawable]; [self insertSubview:_glView atIndex:0]; _glView.contentMode = UIViewContentModeCenter; @@ -6142,6 +6139,9 @@ public: return; } + [CATransaction begin]; + [CATransaction setDisableActions:YES]; + // If the map is pitched consider the viewport to be exactly the same as the bounds. // Otherwise, add a small buffer. CGFloat largestWidth = MAX(_largestAnnotationViewSize.width, CGRectGetWidth(self.frame)); @@ -6236,6 +6236,8 @@ public: } } } + + [CATransaction commit]; } - (void)updateCalloutView |