diff options
author | Tobrun <tobrun.van.nuland@gmail.com> | 2018-12-10 10:40:17 +0100 |
---|---|---|
committer | Tobrun <tobrun@mapbox.com> | 2018-12-11 18:08:16 +0100 |
commit | 75914acb6b66402539fd0913aed0aebe722b2faa (patch) | |
tree | 207203400ca38a8a7b101357a52773fbea824f11 /platform/android/src | |
parent | 5a4a7e7ea87532894aea0b21f58bcc807060d0e4 (diff) | |
download | qtlocation-mapboxgl-75914acb6b66402539fd0913aed0aebe722b2faa.tar.gz |
[android] - add more tests, refactor map padding
Diffstat (limited to 'platform/android/src')
-rwxr-xr-x | platform/android/src/native_map_view.cpp | 14 | ||||
-rwxr-xr-x | platform/android/src/native_map_view.hpp | 4 |
2 files changed, 16 insertions, 2 deletions
diff --git a/platform/android/src/native_map_view.cpp b/platform/android/src/native_map_view.cpp index d908b14d36..a750baa62c 100755 --- a/platform/android/src/native_map_view.cpp +++ b/platform/android/src/native_map_view.cpp @@ -429,10 +429,21 @@ void NativeMapView::setVisibleCoordinateBounds(JNIEnv& env, const jni::Array<jni map->easeTo(cameraOptions, animationOptions); } -void NativeMapView::setContentPadding(JNIEnv&, double top, double left, double bottom, double right) { +void NativeMapView::setContentPadding(JNIEnv&, float top, float left, float bottom, float right) { insets = {top, left, bottom, right}; } +jni::Local<jni::Array<jni::jfloat>> NativeMapView::getContentPadding(JNIEnv& env) { + auto result = jni::Array<jni::jfloat>::New(env, 4); + std::vector<jfloat> vect; + vect.push_back(insets.top()); + vect.push_back(insets.left()); + vect.push_back(insets.bottom()); + vect.push_back(insets.right()); + result.SetRegion<std::vector<jni::jfloat>>(env, 0, vect); + return result; +} + void NativeMapView::scheduleSnapshot(jni::JNIEnv&) { mapRenderer.requestSnapshot([&](PremultipliedImage image) { auto _env = android::AttachEnv(); @@ -1005,6 +1016,7 @@ void NativeMapView::registerNative(jni::JNIEnv& env) { METHOD(&NativeMapView::resetNorth, "nativeResetNorth"), METHOD(&NativeMapView::setVisibleCoordinateBounds, "nativeSetVisibleCoordinateBounds"), METHOD(&NativeMapView::setContentPadding, "nativeSetContentPadding"), + METHOD(&NativeMapView::getContentPadding, "nativeGetContentPadding"), METHOD(&NativeMapView::scheduleSnapshot, "nativeTakeSnapshot"), METHOD(&NativeMapView::getCameraPosition, "nativeGetCameraPosition"), METHOD(&NativeMapView::updateMarker, "nativeUpdateMarker"), diff --git a/platform/android/src/native_map_view.hpp b/platform/android/src/native_map_view.hpp index 57676d3edf..b1f8354d46 100755 --- a/platform/android/src/native_map_view.hpp +++ b/platform/android/src/native_map_view.hpp @@ -138,7 +138,9 @@ public: void setVisibleCoordinateBounds(JNIEnv&, const jni::Array<jni::Object<LatLng>>&, const jni::Object<RectF>&, jni::jdouble, jni::jlong); - void setContentPadding(JNIEnv&, double, double, double, double); + void setContentPadding(JNIEnv&, float, float, float, float); + + jni::Local<jni::Array<jni::jfloat>> getContentPadding(JNIEnv&); void scheduleSnapshot(jni::JNIEnv&); |