Merge branch 'master' into 'master'

[Mobile] enclosed check for FScrollPane drawOverlay

See merge request core-developers/forge!4058
This commit is contained in:
Anthony Calosa
2021-03-01 09:51:29 +00:00

View File

@@ -155,6 +155,7 @@ public abstract class FScrollPane extends FContainer {
@Override
protected void drawOverlay(Graphics g) {
try {
boolean isFieldZoneView = toString().contains("VField")||toString().contains("VZoneDisplay");
//TODO: Consider other ways to indicate scroll potential that fade in and out based on input
//draw triangles indicating scroll potential
@@ -182,6 +183,9 @@ public abstract class FScrollPane extends FContainer {
float y = getHeight() - INDICATOR_MARGIN;
g.fillTriangle(INDICATOR_COLOR, x, y, x - INDICATOR_SIZE, y - INDICATOR_SIZE, x + INDICATOR_SIZE, y - INDICATOR_SIZE);
}
} catch (Exception e) {
e.printStackTrace();
}
}
//allow overriding to adjust what scroll positions are restored after layout