From 48b58f97e65da46fc90c85477c5e0ac2dad38feb Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Mon, 1 Mar 2021 10:03:26 +0000 Subject: [PATCH] Update FScrollPane.java --- forge-gui-mobile/src/forge/toolbox/FScrollPane.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/forge-gui-mobile/src/forge/toolbox/FScrollPane.java b/forge-gui-mobile/src/forge/toolbox/FScrollPane.java index d05a88be084..cb60e76e3d3 100644 --- a/forge-gui-mobile/src/forge/toolbox/FScrollPane.java +++ b/forge-gui-mobile/src/forge/toolbox/FScrollPane.java @@ -157,12 +157,13 @@ public abstract class FScrollPane extends FContainer { 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 + //if ForgePreferences.FPref.UI_ENABLE_MATCH_SCROLL_INDICATOR is missing this will return NPE and could cause lockup on Startup if (!FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.UI_ENABLE_MATCH_SCROLL_INDICATOR)) return; if (!isFieldZoneView) return; + //TODO: Consider other ways to indicate scroll potential that fade in and out based on input + //draw triangles indicating scroll potential if (scrollLeft > 0) { float x = INDICATOR_MARGIN; float y = getHeight() / 2; @@ -183,9 +184,7 @@ 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(); - } + } catch (Exception e) {} } //allow overriding to adjust what scroll positions are restored after layout