tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[darwin, macos] Rename Info.plist key for consistency

Browse Source 
Also removes related dead code in macos MGLMapView.mm
This commit is contained in:
Andrew Kitchen
2017-12-08 10:49:39 -05:00
committed by Chris Loer
parent 155804be4d
commit 4418edbfcd
3 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/darwin/src/MGLRendererConfiguration.h
View File

@@ -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

2
platform/darwin/src/MGLRendererConfiguration.mm
View File

@@ -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>();
}

8
platform/macos/src/MGLMapView.mm
View File

@@ -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 {