summaryrefslogtreecommitdiff
path: root/platform/darwin
diff options
context:
space:
mode:
authorChris Loer <chris.loer@gmail.com>2017-12-08 13:29:15 -0800
committerFabian Guerra Soto <fabian.guerra@mapbox.com>2018-01-03 11:37:53 -0600
commite8abb8c81abe85e85b07c11af7c57a77aa14111e (patch)
treec68eb26639fe79235f862e21be02ca48425a4555 /platform/darwin
parentb94929ca08f706a372d1336850d1346f09677ca4 (diff)
downloadqtlocation-mapboxgl-e8abb8c81abe85e85b07c11af7c57a77aa14111e.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.h2
-rw-r--r--platform/darwin/src/MGLRendererConfiguration.mm2
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>();
}