summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeemu Suo-Anttila <teemusa@vaadin.com>2016-03-04 17:19:13 +0200
committerVaadin Code Review <review@vaadin.com>2016-03-05 08:36:23 +0000
commitd340d22adec09c44fdd2a716e4bb37121e98e42a (patch)
treea34138343529a1d0f3f1e30b2993d2e9c1efe55a
parent854c8582e90e15233d350066d2f92f4573588cab (diff)
downloadvaadin-framework-d340d22adec09c44fdd2a716e4bb37121e98e42a.tar.gz
vaadin-framework-d340d22adec09c44fdd2a716e4bb37121e98e42a.zip
Fix ScrollbarBundle to use proper rounding instead of truncate (#19657)
Change-Id: Ib90bd0762f02ce43b0057e0b27b8491ad6e987d5
-rw-r--r--client/src/com/vaadin/client/widget/escalator/ScrollbarBundle.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/client/src/com/vaadin/client/widget/escalator/ScrollbarBundle.java b/client/src/com/vaadin/client/widget/escalator/ScrollbarBundle.java
index 958029889d..151deb87d1 100644
--- a/client/src/com/vaadin/client/widget/escalator/ScrollbarBundle.java
+++ b/client/src/com/vaadin/client/widget/escalator/ScrollbarBundle.java
@@ -558,7 +558,7 @@ public abstract class ScrollbarBundle implements DeferredWorker {
*/
public final double getScrollPos() {
assert internalGetScrollPos() == toInt32(scrollPos) : "calculated scroll position ("
- + toInt32(scrollPos)
+ + scrollPos
+ ") did not match the DOM element scroll position ("
+ internalGetScrollPos() + ")";
return scrollPos;
@@ -793,7 +793,7 @@ public abstract class ScrollbarBundle implements DeferredWorker {
*/
private static native int toInt32(double val)
/*-{
- return val | 0;
+ return Math.round(val) | 0;
}-*/;
/**