diff --git a/core/src/main/java/io/bitsquare/user/Preferences.java b/core/src/main/java/io/bitsquare/user/Preferences.java index 472bf12ca3..131a84f02b 100644 --- a/core/src/main/java/io/bitsquare/user/Preferences.java +++ b/core/src/main/java/io/bitsquare/user/Preferences.java @@ -83,6 +83,8 @@ public final class Preferences implements Persistable { return defaultTradeCurrency; } + private static boolean _useAnimations = true; + transient private final Storage storage; transient private final BitsquareEnvironment bitsquareEnvironment; @@ -184,6 +186,7 @@ public final class Preferences implements Persistable { }); useAnimationsProperty.addListener((ov) -> { useAnimations = useAnimationsProperty.get(); + _useAnimations = useAnimations; storage.queueUpForSave(2000); }); fiatCurrenciesAsObservable.addListener((Observable ov) -> { @@ -351,6 +354,10 @@ public final class Preferences implements Persistable { return useAnimationsProperty.get(); } + public static boolean useAnimations() { + return _useAnimations; + } + public StringProperty btcDenominationProperty() { return btcDenominationProperty; } diff --git a/gui/src/main/java/io/bitsquare/gui/main/overlays/Overlay.java b/gui/src/main/java/io/bitsquare/gui/main/overlays/Overlay.java index 5be9e70bc7..f9e4f423d8 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/overlays/Overlay.java +++ b/gui/src/main/java/io/bitsquare/gui/main/overlays/Overlay.java @@ -740,11 +740,8 @@ public abstract class Overlay { truncatedMessage = message; } - private int getDuration(int duration) { - if (preferences != null) - return preferences.getUseAnimations() ? duration : 1; - else - return duration; + protected int getDuration(int duration) { + return Preferences.useAnimations() ? duration : 1; } @Override diff --git a/gui/src/main/java/io/bitsquare/gui/main/overlays/notifications/Notification.java b/gui/src/main/java/io/bitsquare/gui/main/overlays/notifications/Notification.java index 08ce1b6b7e..95d9a1d3ad 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/overlays/notifications/Notification.java +++ b/gui/src/main/java/io/bitsquare/gui/main/overlays/notifications/Notification.java @@ -94,7 +94,7 @@ public class Notification extends Overlay { } if (NotificationCenter.useAnimations) { - double duration = 400; + double duration = getDuration(400); Interpolator interpolator = Interpolator.SPLINE(0.25, 0.1, 0.25, 1); gridPane.setRotationAxis(Rotate.X_AXIS); @@ -127,7 +127,7 @@ public class Notification extends Overlay { protected void animateDisplay() { if (NotificationCenter.useAnimations) { double startX = 320; - double duration = 600; + double duration = getDuration(600); Interpolator interpolator = Interpolator.SPLINE(0.25, 0.1, 0.25, 1); Timeline timeline = new Timeline(); @@ -154,6 +154,7 @@ public class Notification extends Overlay { } } + @Override protected void createGridPane() { super.createGridPane();