diff options
author | jmkiley <jordan.kiley@mapbox.com> | 2017-12-13 12:58:27 -0800 |
---|---|---|
committer | jmkiley <jordan.kiley@mapbox.com> | 2017-12-13 12:58:34 -0800 |
commit | 64ea46480635ddfa0aa847b15c2ffc886734a700 (patch) | |
tree | fdf3260ed1e6cc02938a87677ad9a4f0246576fd | |
parent | 187eef17602cf30cd98efdb58ee882fbfca6d8f4 (diff) | |
download | qtlocation-mapboxgl-upstream/jmkiley-opengl-layer.tar.gz |
[ios] added openglstylelayer, remove when dismissing settings vcupstream/jmkiley-opengl-layer
-rw-r--r-- | platform/ios/app/MBXViewController.m | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/platform/ios/app/MBXViewController.m b/platform/ios/app/MBXViewController.m index a49c1d77ba..cb7bb0fd19 100644 --- a/platform/ios/app/MBXViewController.m +++ b/platform/ios/app/MBXViewController.m @@ -131,12 +131,13 @@ typedef NS_ENUM(NSInteger, MBXSettingsMiscellaneousRows) { @property (nonatomic) BOOL usingLocaleBasedCountryLabels; @property (nonatomic) NSDictionary *annotationViewReuseQueueByIdentifier; - +@property (nonatomic) MBXOpenGLLayer *openGlLayer; @end @implementation MBXViewController { BOOL _isTouringWorld; + MBXOpenGLLayer *_openGlLayer; } #pragma mark - Setup & Teardown @@ -273,12 +274,15 @@ typedef NS_ENUM(NSInteger, MBXSettingsMiscellaneousRows) { settingsViewController.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(dismissSettings:)]; UINavigationController *wrapper = [[UINavigationController alloc] initWithRootViewController:settingsViewController]; wrapper.navigationBar.tintColor = self.navigationController.navigationBar.tintColor; + [self.navigationController presentViewController:wrapper animated:YES completion:nil]; } - (void)dismissSettings:(__unused id)sender { [self dismissViewControllerAnimated:YES completion:nil]; + [_mapView.style removeLayer: _openGlLayer]; + _openGlLayer = NULL; } - (NSArray <NSString *> *)settingsSectionTitles @@ -1932,9 +1936,9 @@ typedef NS_ENUM(NSInteger, MBXSettingsMiscellaneousRows) { // using locale-based country labels. _usingLocaleBasedCountryLabels = [[self bestLanguageForUser] isEqualToString:@"en"]; - MBXOpenGLLayer *layer = [[MBXOpenGLLayer alloc] initWithIdentifier:@"mbx-custom"]; + _openGlLayer = [[MBXOpenGLLayer alloc] initWithIdentifier:@"mbx-custom"]; MGLSymbolStyleLayer *symbolLayer = [style layerWithIdentifier:@"admin-3-4-boundaries"]; - [style insertLayer:layer belowLayer:symbolLayer]; + [style insertLayer:_openGlLayer belowLayer:symbolLayer]; } |