diff options
author | Leith Bade <leith@mapbox.com> | 2015-07-31 11:24:59 +1000 |
---|---|---|
committer | Leith Bade <leith@mapbox.com> | 2015-07-31 11:24:59 +1000 |
commit | 30d3642943a23a102b08136f483e61e896a61ad7 (patch) | |
tree | afe496ced03b282b43379c336e6ba1e5b288488f /android | |
parent | 704f8c2bca1afcefcb5536b745f57ecdf1f50e3c (diff) | |
download | qtlocation-mapboxgl-30d3642943a23a102b08136f483e61e896a61ad7.tar.gz |
Fix GPS marker as conversion functions now compensate for screen density
Diffstat (limited to 'android')
-rw-r--r-- | android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java index dfd904fc54..9bfe26b3d6 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java @@ -643,18 +643,20 @@ public class MainActivity extends ActionBarActivity { if (mGpsLocation.hasBearing() || mCompassValid) { mGpsMarker.setImageResource(R.drawable.direction_arrow); - FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams((int) (54.0f * mDensity), (int) (54.0f * mDensity)); - lp.leftMargin = (int) ((screenLocation.x - 54.0f / 2.0f) * mDensity); - lp.topMargin = mMapFrameLayout.getHeight() - (int) ((screenLocation.y + 54.0f / 2.0f) * mDensity); + float iconSize = 54.0f * mDensity; + FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams((int) iconSize, (int) iconSize); + lp.leftMargin = (int) (screenLocation.x - iconSize / 2.0f); + lp.topMargin = mMapFrameLayout.getHeight() - (int) (screenLocation.y + iconSize / 2.0f); mGpsMarker.setLayoutParams(lp); float bearing = mGpsLocation.hasBearing() ? mGpsLocation.getBearing() : mCompassBearing; rotateImageView(mGpsMarker, bearing); mGpsMarker.requestLayout(); } else { mGpsMarker.setImageResource(R.drawable.location_marker); - FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams((int) (27.0f * mDensity), (int) (27.0f * mDensity)); - lp.leftMargin = (int) ((screenLocation.x - 27.0f / 2.0f) * mDensity); - lp.topMargin = mMapFrameLayout.getHeight() - (int) ((screenLocation.y + 27.0f / 2.0f) * mDensity); + float iconSize = 27.0f * mDensity; + FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams((int) iconSize, (int) iconSize); + lp.leftMargin = (int) (screenLocation.x - iconSize / 2.0f); + lp.topMargin = mMapFrameLayout.getHeight() - (int) (screenLocation.y + iconSize / 2.0f); mGpsMarker.setLayoutParams(lp); rotateImageView(mGpsMarker, 0.0f); mGpsMarker.requestLayout(); |