diff options
| author | Andrew Kitchen <andrew.kitchen@mapbox.com> | 2017-12-08 10:49:39 -0500 |
|---|---|---|
| committer | Chris Loer <chris.loer@mapbox.com> | 2017-12-11 10:43:00 -0800 |
| commit | 4418edbfcd68dacecb525d0344a25204e80e17ce (patch) | |
| tree | c7691f4af9cd23350c03af40b1ba1554fec3cc8e | |
| parent | 155804be4dfd5dfd5cd6482b218714d59b1075e9 (diff) | |
| download | qtlocation-mapboxgl-4418edbfcd68dacecb525d0344a25204e80e17ce.tar.gz | |
[darwin, macos] Rename Info.plist key for consistency
Also removes related dead code in macos MGLMapView.mm
| -rw-r--r-- | platform/darwin/src/MGLRendererConfiguration.h | 4 | ||||
| -rw-r--r-- | platform/darwin/src/MGLRendererConfiguration.mm | 2 | ||||
| -rw-r--r-- | platform/macos/src/MGLMapView.mm | 8 |
3 files changed, 3 insertions, 11 deletions
diff --git a/platform/darwin/src/MGLRendererConfiguration.h b/platform/darwin/src/MGLRendererConfiguration.h index 35cf828536..676cc91719 100644 --- a/platform/darwin/src/MGLRendererConfiguration.h +++ b/platform/darwin/src/MGLRendererConfiguration.h @@ -31,8 +31,8 @@ NS_ASSUME_NONNULL_BEGIN Currently only used for CJK glyphs. Changing this at run time is not currently supported. Enable client-side rendering of CJK glyphs by setting - `MGLIdeographicFontFamilyName` in your containing app's Info.plist to a value - which will be available at runtime, i.e. "Arial Unicode MS". */ + `MGLIdeographFontFamilyName` in your containing app's Info.plist to a value + which will be available at run time, i.e. "Arial Unicode MS". */ @property (nonatomic, readonly) mbgl::optional<std::string> localFontFamilyName; @end diff --git a/platform/darwin/src/MGLRendererConfiguration.mm b/platform/darwin/src/MGLRendererConfiguration.mm index ae7d7dd9fe..be60c3c787 100644 --- a/platform/darwin/src/MGLRendererConfiguration.mm +++ b/platform/darwin/src/MGLRendererConfiguration.mm @@ -35,7 +35,7 @@ } - (mbgl::optional<std::string>)localFontFamilyName { - NSString *fontFamilyName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"MGLIdeographicFontFamilyName"]; + NSString *fontFamilyName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"MGLIdeographFontFamilyName"]; return fontFamilyName ? std::string([fontFamilyName UTF8String]) : mbgl::optional<std::string>(); } diff --git a/platform/macos/src/MGLMapView.mm b/platform/macos/src/MGLMapView.mm index 78a6d0bfae..b32edffd43 100644 --- a/platform/macos/src/MGLMapView.mm +++ b/platform/macos/src/MGLMapView.mm @@ -144,8 +144,6 @@ public: @property (nonatomic, readwrite) NSView *attributionView; @property (nonatomic, readwrite) MGLStyle *style; -@property (nonatomic, readonly) NSString *ideographicFontFamilyName; - /// Mapping from reusable identifiers to annotation images. @property (nonatomic) NS_MUTABLE_DICTIONARY_OF(NSString *, MGLAnnotationImage *) *annotationImagesByIdentifier; @@ -654,12 +652,6 @@ public: return _rendererFrontend->getRenderer(); } -#pragma mark Ideographic Font Info - -- (NSString *)ideographicFontFamilyName { - return [[NSBundle mainBundle] objectForInfoDictionaryKey:@"MGLIdeographicFontFamilyName"]; -} - #pragma mark View hierarchy and drawing - (void)viewWillMoveToWindow:(NSWindow *)newWindow { |