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

Fix context menu landscape layout

Browse source
This commit is contained in:
Alexey Kulish 2018-01-31 20:53:53 +03:00
parent fb105d4b30
commit 69d708f48d
1 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
View file

@ -605,6 +605,7 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
private float getToolbarAlpha(int y) { private float getToolbarAlpha(int y) {
float a = 0; float a = 0;
if (menu != null && !menu.isLandscapeLayout()) {
if (y < minHalfY) { if (y < minHalfY) {
a = 1f - (y - bottomToolbarPosY) * (1f / (minHalfY - bottomToolbarPosY)); a = 1f - (y - bottomToolbarPosY) * (1f / (minHalfY - bottomToolbarPosY));
} }
@ -613,6 +614,7 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
} else if (a > 1) { } else if (a > 1) {
a = 1; a = 1;
} }
}
return a; return a;
} }
@ -623,6 +625,7 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
private float getTopButtonAlpha(int y) { private float getTopButtonAlpha(int y) {
float a = 0; float a = 0;
if (menu != null && !menu.isLandscapeLayout()) {
int headerTopY = getHeaderOnlyTopY(); int headerTopY = getHeaderOnlyTopY();
if (y < headerTopY) { if (y < headerTopY) {
a = 1f - (y - minHalfY) * (1f / (headerTopY - minHalfY)); a = 1f - (y - minHalfY) * (1f / (headerTopY - minHalfY));
@ -632,6 +635,7 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
} else if (a > 1) { } else if (a > 1) {
a = 1; a = 1;
} }
}
return a; return a;
} }