diff options
| author | M.Stephen <truestyle2005@163.com> | 2019-06-12 17:39:31 +0800 |
|---|---|---|
| committer | M.Stephen <truestyle2005@163.com> | 2019-06-12 17:39:31 +0800 |
| commit | a71fe6bdcd6ea9764ca4cd1e43d4535f3fb09c3e (patch) | |
| tree | 8c2f56903355c9a831de897f9fa6116305543cd7 /platform/darwin | |
| parent | 1da72a70192e015fa98a0863bf2adc0270508ca1 (diff) | |
| download | qtlocation-mapboxgl-a71fe6bdcd6ea9764ca4cd1e43d4535f3fb09c3e.tar.gz | |
[iOS, macOS]Support mac os
Diffstat (limited to 'platform/darwin')
| -rw-r--r-- | platform/darwin/src/MGLRendererConfiguration.mm | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/platform/darwin/src/MGLRendererConfiguration.mm b/platform/darwin/src/MGLRendererConfiguration.mm index 3f78de49ae..89d87c5014 100644 --- a/platform/darwin/src/MGLRendererConfiguration.mm +++ b/platform/darwin/src/MGLRendererConfiguration.mm @@ -76,7 +76,14 @@ static NSString * const MGLCollisionBehaviorPre4_0Key = @"MGLCollisionBehaviorPr return mbgl::optional<std::string>(); } - return fontFamilyName ? std::string([fontFamilyName UTF8String]) : std::string([[UIFont systemFontOfSize:0 weight:UIFontWeightRegular].familyName UTF8String]); + std::string systemFontFamilyName; +#if TARGET_OS_IPHONE + systemFontFamilyName = std::string([[UIFont systemFontOfSize:0 weight:UIFontWeightRegular].familyName UTF8String]); +#else + systemFontFamilyName = std::string([[NSFont systemFontOfSize:0 weight:UIFontWeightRegular].familyName UTF8String]); +#endif + + return fontFamilyName ? std::string([fontFamilyName UTF8String]):systemFontFamilyName; } @end |