map-per/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Merge pull request #4925 from alexzatsepin/fix-nav-buttons-controller

Browse source 
[android] Fixed the wrong calculation of nav buttons position in edge…
This commit is contained in:
Roman Kuznetsov 2016-12-09 11:59:01 +03:00 • committed by GitHub
commit 5ffc5c7965
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
android/src/com/mapswithme/maps/NavigationButtonsAnimationController.java
View file

@ -53,13 +53,13 @@ class NavigationButtonsAnimationController
Animations.appearSliding(mZoomIn, Animations.RIGHT, null);
Animations.appearSliding(mZoomOut, Animations.RIGHT, null);
updateZoomButtonsPosition(mTopLimit);
updateZoomButtonsPosition();
}
void setTopLimit(float limit)
{
mTopLimit = limit;
updateZoomButtonsPosition(limit);
updateZoomButtonsPosition();
}
void onPlacePageVisibilityChanged(boolean isVisible)
@ -93,15 +93,15 @@ class NavigationButtonsAnimationController
});
}
private void updateZoomButtonsPosition(float newTop)
private void updateZoomButtonsPosition()
{
// It means that the zoom buttons fit in screen perfectly,
// any updates of position are no needed.
if (mZoomIn.getTop() >= mTopLimit)
if (mZoomIn.getTop() >= mTopLimit && UiUtils.isVisible(mZoomIn))
return;
// If the top limit is decreased we try to return zoom buttons at initial position.
if (newTop < mTopLimit && tryPlaceZoomButtonsAtInitialPosition())
if (mTopLimit < mZoomIn.getTop() && tryPlaceZoomButtonsAtInitialPosition())
{
LOGGER.d("Zoom buttons were come back to initial position");
return;