diff options
author | Minh Nguyễn <mxn@1ec5.org> | 2015-11-09 12:43:42 -0800 |
---|---|---|
committer | Minh Nguyễn <mxn@1ec5.org> | 2015-11-09 12:43:42 -0800 |
commit | affb1199bf885a52f705369b67f008271567f2d8 (patch) | |
tree | 04c1548172dd67688615e8a43dd43776d30d791f | |
parent | c4cbe648b1c9cf224740015efaac54bc327f9b7d (diff) | |
parent | 3631e14dd3936b51e94c98b76df6e0823d448777 (diff) | |
download | qtlocation-mapboxgl-affb1199bf885a52f705369b67f008271567f2d8.tar.gz |
Merge remote-tracking branch 'bwhtmn/ios9_multitasking' into 1ec5-ios9-multitasking-2309
-rw-r--r-- | platform/ios/MGLMapView.mm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/platform/ios/MGLMapView.mm b/platform/ios/MGLMapView.mm index 942c6563de..43721896f2 100644 --- a/platform/ios/MGLMapView.mm +++ b/platform/ios/MGLMapView.mm @@ -351,7 +351,6 @@ std::chrono::steady_clock::duration secondsAsDuration(float duration) // observe app activity // [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(willTerminate) name:UIApplicationWillTerminateNotification object:nil]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(sleepGL:) name:UIApplicationWillResignActiveNotification object:nil]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(sleepGL:) name:UIApplicationDidEnterBackgroundNotification object:nil]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(wakeGL:) name:UIApplicationWillEnterForegroundNotification object:nil]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(wakeGL:) name:UIApplicationDidBecomeActiveNotification object:nil]; @@ -427,8 +426,8 @@ std::chrono::steady_clock::duration secondsAsDuration(float duration) MGLReachability *reachability = [notification object]; if ( ! _isWaitingForRedundantReachableNotification && [reachability isReachable]) { - mbgl::NetworkStatus::Reachable(); - } + mbgl::NetworkStatus::Reachable(); + } _isWaitingForRedundantReachableNotification = NO; } @@ -747,6 +746,7 @@ std::chrono::steady_clock::duration secondsAsDuration(float duration) { self.glSnapshotView = [[UIImageView alloc] initWithFrame:self.glView.frame]; self.glSnapshotView.autoresizingMask = self.glView.autoresizingMask; + self.glSnapshotView.contentMode = UIViewContentModeCenter; [self insertSubview:self.glSnapshotView aboveSubview:self.glView]; } |