diff options
author | Tobrun <tobrun@mapbox.com> | 2017-03-31 13:48:47 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-31 13:48:47 +0200 |
commit | 8e538b4d06b12a8b0649b6b98386acca5fb5eeef (patch) | |
tree | 90ec77a67b0fbfe3db18870f1488f73022d37d91 /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations | |
parent | a46d91f7c5cbcdd9343d1a3dfba17e375a466e2a (diff) | |
download | qtlocation-mapboxgl-8e538b4d06b12a8b0649b6b98386acca5fb5eeef.tar.gz |
Cherry pick v5.0.2 changes (#8586)
* [android] execute resource transform callback on the right thread
* [android] allow resetting of resource transform callback
* update CHANGELOG for v5.0.2
* [android] - correct anchoring when Icon is updated (#8519)
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations')
2 files changed, 10 insertions, 0 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerView.java index 220d3322cb..30336d4ebd 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerView.java @@ -390,6 +390,15 @@ public class MarkerView extends Marker { } /** + * Invalidates the MarkerView resulting in remeasuring the View. + */ + void invalidate() { + width = height = 0; + offsetX = offsetY = MapboxConstants.UNMEASURED; + markerViewManager.invalidateViewMarkersInVisibleRegion(); + } + + /** * Get the String representation of a MarkerView. * * @return the String representation. diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java index 315e12d280..bb51f3bfc2 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java @@ -232,6 +232,7 @@ public class MarkerViewManager implements MapView.OnMapChangedListener { View convertView = markerViewMap.get(markerView); if (convertView != null && convertView instanceof ImageView) { ((ImageView) convertView).setImageBitmap(markerView.getIcon().getBitmap()); + markerView.invalidate(); } } |