diff --git a/core/src/main/java/io/bitsquare/user/Preferences.java b/core/src/main/java/io/bitsquare/user/Preferences.java index d87b35da60..472bf12ca3 100644 --- a/core/src/main/java/io/bitsquare/user/Preferences.java +++ b/core/src/main/java/io/bitsquare/user/Preferences.java @@ -91,7 +91,6 @@ public final class Preferences implements Persistable { // Persisted fields private String btcDenomination = MonetaryFormat.CODE_BTC; private boolean useAnimations = true; - private boolean useEffects = true; private final ArrayList fiatCurrencies; private final ArrayList cryptoCurrencies; private BlockChainExplorer blockChainExplorerMainNet; diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedView.fxml b/gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedView.fxml index fb75a67b18..9c03c2ecee 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedView.fxml +++ b/gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedView.fxml @@ -31,7 +31,7 @@ - + diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml b/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml index 8077c70301..2039695b3b 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml +++ b/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml @@ -32,7 +32,7 @@ - + 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 4f210ef3d6..5be9e70bc7 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 @@ -409,7 +409,7 @@ public abstract class Overlay { protected void animateDisplay() { gridPane.setOpacity(0); Interpolator interpolator = Interpolator.SPLINE(0.25, 0.1, 0.25, 1); - double duration = 400; + double duration = getDuration(400); Timeline timeline = new Timeline(); ObservableList keyFrames = timeline.getKeyFrames(); @@ -475,7 +475,7 @@ public abstract class Overlay { protected void animateHide(Runnable onFinishedHandler) { Interpolator interpolator = Interpolator.SPLINE(0.25, 0.1, 0.25, 1); - double duration = 200; + double duration = getDuration(200); Timeline timeline = new Timeline(); ObservableList keyFrames = timeline.getKeyFrames(); @@ -740,6 +740,13 @@ public abstract class Overlay { truncatedMessage = message; } + private int getDuration(int duration) { + if (preferences != null) + return preferences.getUseAnimations() ? duration : 1; + else + return duration; + } + @Override public String toString() { return "Popup{" +