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 cb2ede54bc
commit f14a84dc19
1 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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