summaryrefslogtreecommitdiff
path: root/platform/macos
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2017-04-24 13:31:22 -0400
committerGitHub <noreply@github.com>2017-04-24 13:31:22 -0400
commit6f708ac5458fe332e25ca398431928b7ff5ba404 (patch)
tree359f3ce3c3ce529b4a46d330d37c5840f0693492 /platform/macos
parent42c308fd8fc227b0c4d467543ef9f57e03e72ede (diff)
downloadqtlocation-mapboxgl-6f708ac5458fe332e25ca398431928b7ff5ba404.tar.gz
[ios, macos] Update MGLMapView logo view (#8771)
* [ios, macos] Updated logo view to new Mapbox logo * [default] Updated attribution logo SVG
Diffstat (limited to 'platform/macos')
-rw-r--r--platform/macos/CHANGELOG.md1
-rw-r--r--platform/macos/sdk/mapbox.pdfbin3762 -> 26280 bytes
-rw-r--r--platform/macos/src/MGLMapView.mm2
3 files changed, 2 insertions, 1 deletions
diff --git a/platform/macos/CHANGELOG.md b/platform/macos/CHANGELOG.md
index a8efea5863..db8c4804f3 100644
--- a/platform/macos/CHANGELOG.md
+++ b/platform/macos/CHANGELOG.md
@@ -10,6 +10,7 @@
### Other changes
+* Updated MGLMapView’s logo view to display [the new Mapbox logo](https://www.mapbox.com/blog/new-mapbox-logo/). ([#8771](https://github.com/mapbox/mapbox-gl-native/pull/8771))
* Fixed an issue causing attribution button text to appear blue instead of black. ([#8701](https://github.com/mapbox/mapbox-gl-native/pull/8701))
* Fixed a crash or console spew when MGLMapView is initialized with a frame smaller than 64 points wide by 64 points tall. ([#8562](https://github.com/mapbox/mapbox-gl-native/pull/8562))
* The error passed into `-[MGLMapViewDelegate mapViewDidFailLoadingMap:withError:]` now includes a more specific description and failure reason. ([#8418](https://github.com/mapbox/mapbox-gl-native/pull/8418))
diff --git a/platform/macos/sdk/mapbox.pdf b/platform/macos/sdk/mapbox.pdf
index c08a0e3135..fbe86d3a43 100644
--- a/platform/macos/sdk/mapbox.pdf
+++ b/platform/macos/sdk/mapbox.pdf
Binary files differ
diff --git a/platform/macos/src/MGLMapView.mm b/platform/macos/src/MGLMapView.mm
index c56b32bfcf..cf3a5afe7f 100644
--- a/platform/macos/src/MGLMapView.mm
+++ b/platform/macos/src/MGLMapView.mm
@@ -363,7 +363,7 @@ public:
NSImage *logoImage = [[NSImage alloc] initWithContentsOfFile:
[[NSBundle mgl_frameworkBundle] pathForResource:@"mapbox" ofType:@"pdf"]];
// Account for the image’s built-in padding when aligning other controls to the logo.
- logoImage.alignmentRect = NSInsetRect(logoImage.alignmentRect, 3, 3);
+ logoImage.alignmentRect = NSInsetRect(logoImage.alignmentRect, 0, 3);
_logoView.image = logoImage;
_logoView.translatesAutoresizingMaskIntoConstraints = NO;
_logoView.accessibilityTitle = NSLocalizedStringWithDefaultValue(@"MAP_A11Y_TITLE", nil, nil, @"Mapbox", @"Accessibility title");