Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-10-23 09:21:27 +02:00
commit 128460b9f2

View file

@ -441,7 +441,7 @@ public class MapContextMenuFragment extends Fragment {
int dy = 0; int dy = 0;
if (!menu.isLandscapeLayout() && menuTopViewHeight != 0) { if (!menu.isLandscapeLayout() && menuTopViewHeight != 0) {
dy = newMenuTopViewHeight - menuTopViewHeight; dy = Math.max(0, newMenuTopViewHeight - menuTopViewHeight);
} }
menuTopViewHeight = newMenuTopViewHeight; menuTopViewHeight = newMenuTopViewHeight;
menuTitleHeight = menuTopShadowHeight + menuTopShadowAllHeight + dy; menuTitleHeight = menuTopShadowHeight + menuTopShadowAllHeight + dy;