diff options
author | Chris Loer <chris.loer@gmail.com> | 2017-12-08 13:29:15 -0800 |
---|---|---|
committer | Chris Loer <chris.loer@mapbox.com> | 2017-12-11 10:43:00 -0800 |
commit | 4fcf1853b050c357f2adbf45ef793b2baa6eb78d (patch) | |
tree | 32f76caedba6d8517aa6afa432158326a1b94c9b /platform/darwin | |
parent | 6dbb9eb22a43923a12440df8822fafaee8fe6731 (diff) | |
download | qtlocation-mapboxgl-4fcf1853b050c357f2adbf45ef793b2baa6eb78d.tar.gz |
[ios,macos] Revert ideographic->ideograph name change.
Original GL JS name was meant to represent "font family to use for locally generating ideographs", but "ideographic font family" communicates a similar intent more concisely.
Diffstat (limited to 'platform/darwin')
-rw-r--r-- | platform/darwin/src/MGLRendererConfiguration.h | 2 | ||||
-rw-r--r-- | platform/darwin/src/MGLRendererConfiguration.mm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/platform/darwin/src/MGLRendererConfiguration.h b/platform/darwin/src/MGLRendererConfiguration.h index dc434a4fbb..31aad0a742 100644 --- a/platform/darwin/src/MGLRendererConfiguration.h +++ b/platform/darwin/src/MGLRendererConfiguration.h @@ -31,7 +31,7 @@ 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 - `MGLIdeographFontFamilyName` in your containing app's Info.plist to a value + `MGLIdeographicFontFamilyName` in your containing app's Info.plist to a value which will be available at run time, e.g. "PingFang". */ @property (nonatomic, readonly) mbgl::optional<std::string> localFontFamilyName; diff --git a/platform/darwin/src/MGLRendererConfiguration.mm b/platform/darwin/src/MGLRendererConfiguration.mm index be60c3c787..ae7d7dd9fe 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:@"MGLIdeographFontFamilyName"]; + NSString *fontFamilyName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"MGLIdeographicFontFamilyName"]; return fontFamilyName ? std::string([fontFamilyName UTF8String]) : mbgl::optional<std::string>(); } |