tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] - hold off handling hover events untill map has been created

Browse Source
This commit is contained in:
Tobrun Van Nuland
2017-10-06 16:29:49 +02:00
committed by Tobrun
parent 24bd336b88
commit ff03a75da4
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
View File

@@ -2,8 +2,8 @@ package com.mapbox.mapboxsdk.maps;
import android.content.Context;
import android.graphics.PointF;
import android.os.Build;
import android.opengl.GLSurfaceView;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.CallSuper;
import android.support.annotation.IntDef;
@@ -47,9 +47,9 @@ import javax.microedition.khronos.opengles.GL10;
import timber.log.Timber;
import static android.opengl.GLSurfaceView.RENDERMODE_WHEN_DIRTY;
import static com.mapbox.mapboxsdk.maps.widgets.CompassView.TIME_MAP_NORTH_ANIMATION;
import static com.mapbox.mapboxsdk.maps.widgets.CompassView.TIME_WAIT_IDLE;
import static android.opengl.GLSurfaceView.RENDERMODE_WHEN_DIRTY;
/**
* <p>
@@ -382,7 +382,7 @@ public class MapView extends FrameLayout {
@Override
public boolean onTouchEvent(MotionEvent event) {
if (!isMapInitialized()) {
if (!isMapInitialized() || !isZoomButtonControllerInitialized()) {
return super.onTouchEvent(event);
}
@@ -419,6 +419,10 @@ public class MapView extends FrameLayout {
@Override
public boolean onHoverEvent(MotionEvent event) {
if (!isZoomButtonControllerInitialized()) {
return super.onHoverEvent(event);
}
switch (event.getActionMasked()) {
case MotionEvent.ACTION_HOVER_ENTER:
case MotionEvent.ACTION_HOVER_MOVE:
@@ -506,7 +510,9 @@ public class MapView extends FrameLayout {
@CallSuper
protected void onDetachedFromWindow() {
super.onDetachedFromWindow();
mapZoomButtonController.setVisible(false);
if (isZoomButtonControllerInitialized()) {
mapZoomButtonController.setVisible(false);
}
}
// Called when view is hidden and shown
@@ -516,7 +522,7 @@ public class MapView extends FrameLayout {
return;
}
if (mapZoomButtonController != null) {
if (isZoomButtonControllerInitialized()) {
mapZoomButtonController.setVisible(visibility == View.VISIBLE);
}
}
@@ -582,6 +588,10 @@ public class MapView extends FrameLayout {
return nativeMapView != null;
}
private boolean isZoomButtonControllerInitialized() {
return mapZoomButtonController != null;
}
MapboxMap getMapboxMap() {
return mapboxMap;
}