Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

[ios] Make PingFang as the default local font family #13988

Merged
merged 2 commits into from
Feb 27, 2019
Merged

[ios] Make PingFang as the default local font family #13988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac6810d
Make PingFang as the default local font family
lloydsheng Feb 26, 2019
5173ce6
Add a changelog
lloydsheng Feb 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions platform/darwin/src/MGLRendererConfiguration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,9 @@ MGL_EXPORT
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 run time, e.g. "PingFang". */
@property (nonatomic, readonly) mbgl::optional<std::string> localFontFamilyName;
which will be available at run time. Default font for local ideograph font family
is "PingFang". */
@property (nonatomic, readonly) std::string localFontFamilyName;

/**
A Boolean value indicating whether symbol layers may enable per-source symbol
Expand Down
4 changes: 2 additions & 2 deletions platform/darwin/src/MGLRendererConfiguration.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ - (const float)scaleFactor {
return mbgl::optional<std::string>();
}

- (mbgl::optional<std::string>)localFontFamilyName {
- (std::string)localFontFamilyName {
NSString *fontFamilyName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"MGLIdeographicFontFamilyName"];

return fontFamilyName ? std::string([fontFamilyName UTF8String]) : mbgl::optional<std::string>();
return fontFamilyName ? std::string([fontFamilyName UTF8String]) : std::string("PingFang");
}

@end
1 change: 1 addition & 0 deletions platform/ios/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Mapbox welcomes participation and contributions from everyone. Please read [CONT
* Improved tilt gesture performance. ([#13902](https://github.com/mapbox/mapbox-gl-native/pull/13902))
* Fixed a bug where `layoutSubviews` was always called on device rotation, regardless of the application's or top-most view controller's supported orientations. ([#13900](https://github.com/mapbox/mapbox-gl-native/pull/13900))
* Added `MGLNetworkConfiguration` class to customize the SDK's `NSURLSessionConfiguration` object. ([#11447](https://github.com/mapbox/mapbox-gl-native/pull/13886))
* Made PingFang as the default local font family for CJK glyphs. ([#13988](https://github.com/mapbox/mapbox-gl-native/pull/13988))

## 4.8.0 - January 30, 2019

Expand Down