Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix #7806

Browse source
This commit is contained in:
Chumva 2019-11-04 15:21:47 +02:00
parent 2a045a1140
commit a671b3908a
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -1190,9 +1190,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
} }
public void readLocationToShow() { public void readLocationToShow() {
if (!getDashboard().isVisible()) { showMapControls();
mapLayers.getMapControlsLayer().showMapControlsIfHidden();
}
LatLon cur = new LatLon(mapView.getLatitude(), mapView.getLongitude()); LatLon cur = new LatLon(mapView.getLatitude(), mapView.getLongitude());
LatLon latLonToShow = settings.getAndClearMapLocationToShow(); LatLon latLonToShow = settings.getAndClearMapLocationToShow();
@ -1482,6 +1480,11 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
if (mapLayers.getMapQuickActionLayer() != null) { if (mapLayers.getMapQuickActionLayer() != null) {
mapLayers.getMapQuickActionLayer().refreshLayer(); mapLayers.getMapQuickActionLayer().refreshLayer();
} }
MapControlsLayer mapControlsLayer = mapLayers.getMapControlsLayer();
if (mapControlsLayer != null && (!mapControlsLayer.isMapControlsVisible() || settings.MAP_EMPTY_STATE_ALLOWED.get())) {
showMapControls();
}
mapLayers.updateLayers(mapView); mapLayers.updateLayers(mapView);
mapActions.updateDrawerMenu(); mapActions.updateDrawerMenu();
mapView.setComplexZoom(mapView.getZoom(), mapView.getSettingsMapDensity()); mapView.setComplexZoom(mapView.getZoom(), mapView.getSettingsMapDensity());
@ -1636,6 +1639,12 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
}, 2500); }, 2500);
} }
public void showMapControls() {
if (!getDashboard().isVisible() && mapLayers.getMapControlsLayer() != null) {
mapLayers.getMapControlsLayer().showMapControlsIfHidden();
}
}
public OsmandMapTileView getMapView() { public OsmandMapTileView getMapView() {
return mapView; return mapView;
} }

7
OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
View file

@ -974,8 +974,11 @@ public class ContextMenuLayer extends OsmandMapLayer {
} }
} }
} }
if (!processed && activity.getMyApplication().getSettings().MAP_EMPTY_STATE_ALLOWED.get()) { if (!processed) {
activity.getMapLayers().getMapControlsLayer().switchMapControlsVisibility(true); MapControlsLayer mapControlsLayer = activity.getMapLayers().getMapControlsLayer();
if (!mapControlsLayer.isMapControlsVisible() || activity.getMyApplication().getSettings().MAP_EMPTY_STATE_ALLOWED.get()) {
mapControlsLayer.switchMapControlsVisibility(true);
}
} }
return false; return false;
} }