Skip to content

Commit f6fd889

Browse files
committed
ignore scroll events with zero scroll movement
1 parent 21d91d3 commit f6fd889

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

src/main/java/com/sparrowwallet/sparrow/control/FeeRangeSlider.java

+8-6
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,15 @@ public Double fromString(String string) {
4949
});
5050

5151
setOnScroll(event -> {
52-
double newFeeRate = getFeeRate() + (event.getDeltaY() > 0 ? FEE_RATE_SCROLL_INCREMENT : -FEE_RATE_SCROLL_INCREMENT);
53-
if(newFeeRate < LONG_FEE_RATES_RANGE.get(0)) {
54-
newFeeRate = LONG_FEE_RATES_RANGE.get(0);
55-
} else if(newFeeRate > LONG_FEE_RATES_RANGE.get(LONG_FEE_RATES_RANGE.size() - 1)) {
56-
newFeeRate = LONG_FEE_RATES_RANGE.get(LONG_FEE_RATES_RANGE.size() - 1);
52+
if(event.getDeltaY() != 0) {
53+
double newFeeRate = getFeeRate() + (event.getDeltaY() > 0 ? FEE_RATE_SCROLL_INCREMENT : -FEE_RATE_SCROLL_INCREMENT);
54+
if(newFeeRate < LONG_FEE_RATES_RANGE.get(0)) {
55+
newFeeRate = LONG_FEE_RATES_RANGE.get(0);
56+
} else if(newFeeRate > LONG_FEE_RATES_RANGE.get(LONG_FEE_RATES_RANGE.size() - 1)) {
57+
newFeeRate = LONG_FEE_RATES_RANGE.get(LONG_FEE_RATES_RANGE.size() - 1);
58+
}
59+
setFeeRate(newFeeRate);
5760
}
58-
setFeeRate(newFeeRate);
5961
});
6062
}
6163

src/main/java/com/sparrowwallet/sparrow/control/QRDisplayDialog.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public QRDisplayDialog(UR ur, BBQR bbqr, boolean addLegacyEncodingOption, boolea
101101
stackPane.getChildren().add(qrImageView);
102102

103103
qrImageView.setOnScroll(scrollEvent -> {
104-
if(animateQRService != null && animateQRService.isRunning()) {
104+
if(animateQRService != null && animateQRService.isRunning() && scrollEvent.getDeltaY() != 0) {
105105
Duration duration = animateQRService.getPeriod();
106106
Duration newDuration = scrollEvent.getDeltaY() > 0 ? duration.multiply(1.1) : duration.multiply(0.9);
107107
if(newDuration.lessThan(Duration.millis(ANIMATION_PERIOD_MILLIS*10)) && newDuration.greaterThan(Duration.millis(ANIMATION_PERIOD_MILLIS/2))) {

0 commit comments

Comments
 (0)