summaryrefslogtreecommitdiff
path: root/platform/ios/src/MGLCompassButton.mm
diff options
context:
space:
mode:
authorm-stephen <truestyle2005@163.com>2019-09-05 02:29:05 +0800
committerJason Wray <friedbunny@users.noreply.github.com>2019-09-04 11:29:05 -0700
commitb07217bbdd435b378e8a492c5f535d3e892fa82e (patch)
tree2566269afe4502790ab1996f3294402b913353a3 /platform/ios/src/MGLCompassButton.mm
parent71ea9495fddf2d2daf62d65b1e0948fdb3ff58cd (diff)
downloadqtlocation-mapboxgl-b07217bbdd435b378e8a492c5f535d3e892fa82e.tar.gz
[ios] Fix compass font weight being too light on iOS 13
Diffstat (limited to 'platform/ios/src/MGLCompassButton.mm')
-rw-r--r--platform/ios/src/MGLCompassButton.mm9
1 files changed, 8 insertions, 1 deletions
diff --git a/platform/ios/src/MGLCompassButton.mm b/platform/ios/src/MGLCompassButton.mm
index 94a6820a74..acb25a560c 100644
--- a/platform/ios/src/MGLCompassButton.mm
+++ b/platform/ios/src/MGLCompassButton.mm
@@ -63,9 +63,16 @@
UIImage *scaleImage = [UIImage mgl_resourceImageNamed:@"Compass"];
UIGraphicsBeginImageContextWithOptions(scaleImage.size, NO, UIScreen.mainScreen.scale);
[scaleImage drawInRect:{CGPointZero, scaleImage.size}];
+
+ UIFont *northFont;
+ if (@available(iOS 13.0, *)) {
+ northFont = [UIFont systemFontOfSize:11 weight:UIFontWeightLight];
+ } else {
+ northFont = [UIFont systemFontOfSize:11 weight:UIFontWeightUltraLight];
+ }
NSAttributedString *north = [[NSAttributedString alloc] initWithString:NSLocalizedStringWithDefaultValue(@"COMPASS_NORTH", nil, nil, @"N", @"Compass abbreviation for north") attributes:@{
- NSFontAttributeName: [UIFont systemFontOfSize:11 weight:UIFontWeightUltraLight],
+ NSFontAttributeName: northFont,
NSForegroundColorAttributeName: [UIColor whiteColor],
}];
CGRect stringRect = CGRectMake((scaleImage.size.width - north.size.width) / 2,