diff options
| author | Jason Wray <jason@mapbox.com> | 2017-07-24 19:24:24 -0400 |
|---|---|---|
| committer | Jason Wray <jason@mapbox.com> | 2017-07-24 19:24:24 -0400 |
| commit | dcd9a38388fe5fc4c70a3e39af4db10a3c09ed49 (patch) | |
| tree | 45f33105f84aba7cce3cd2dd04c72ca9c6dddfe8 | |
| parent | 7aad3613c3549ae5f4388fcbeef969e13274892b (diff) | |
| download | qtlocation-mapboxgl-upstream/fb-attribution-tint-unforcening.tar.gz | |
[ios] Don't force the attribution button tint color to updateupstream/fb-attribution-tint-unforcening
| -rw-r--r-- | platform/ios/CHANGELOG.md | 1 | ||||
| -rw-r--r-- | platform/ios/src/MGLMapView.mm | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md index 93da2ff372..9ebf52311f 100644 --- a/platform/ios/CHANGELOG.md +++ b/platform/ios/CHANGELOG.md @@ -5,6 +5,7 @@ Mapbox welcomes participation and contributions from everyone. Please read [CONT ## 3.6.1 * Reduced the size of the dynamic framework by optimizing symbol visibility. ([#7604](https://github.com/mapbox/mapbox-gl-native/pull/7604)) +* Fixed an issue where the attribution button would have its custom tint color reset when the map view received a tint color change notification, such as when an alert controller was presented. ([#9598](https://github.com/mapbox/mapbox-gl-native/pull/9598)) ## 3.6.0 - June 29, 2017 diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm index f3b0d8506a..2de1496998 100644 --- a/platform/ios/src/MGLMapView.mm +++ b/platform/ios/src/MGLMapView.mm @@ -1144,8 +1144,10 @@ public: - (void)updateTintColorForView:(UIView *)view { - // stop at recursing container & annotation views (#8522) - if ([view isEqual:self.annotationContainerView]) return; + // Don't update: + // - annotation views + // - attribution button (handled automatically) + if ([view isEqual:self.annotationContainerView] || [view isEqual:self.attributionButton]) return; if ([view respondsToSelector:@selector(setTintColor:)]) view.tintColor = self.tintColor; |