From c390b386ad0da0e0eac29665f0db77bd30cb5e5f Mon Sep 17 00:00:00 2001 From: Teemu Suo-Anttila Date: Thu, 7 Jan 2016 15:45:26 +0200 Subject: Fix ScrollbarBundle to not round down pixel values (#19421) Since Escalator now uses subpixels in most cases, scrollbar calculation fails when ScrollbarBundle calls Math.floor for the offset size. Removed rounding, added a pixel epsilon check that we don't make a scrollbar when it's not really needed. Change-Id: I228fd7dd48d4506e5b2b7bb799291c9a122ea3fe --- .../vaadin/client/widget/escalator/ScrollbarBundle.java | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'client') diff --git a/client/src/com/vaadin/client/widget/escalator/ScrollbarBundle.java b/client/src/com/vaadin/client/widget/escalator/ScrollbarBundle.java index 2b33d7103f..958029889d 100644 --- a/client/src/com/vaadin/client/widget/escalator/ScrollbarBundle.java +++ b/client/src/com/vaadin/client/widget/escalator/ScrollbarBundle.java @@ -402,11 +402,6 @@ public abstract class ScrollbarBundle implements DeferredWorker { /** * Sets the length of the scrollbar. - *

- * Note: Even though {@code double} values are used, they are - * currently only used as integers as large {@code int} (or small but fast - * {@code long}). This means, all values are truncated to zero decimal - * places. * * @param px * the length of the scrollbar in pixels @@ -437,7 +432,7 @@ public abstract class ScrollbarBundle implements DeferredWorker { } private void setOffsetSizeNow(double px) { - internalSetOffsetSize(Math.max(0, truncate(px))); + internalSetOffsetSize(Math.max(0, px)); recalculateMaxScrollPos(); forceScrollbar(showsScrollHandle()); fireVisibilityChangeIfNeeded(); @@ -595,11 +590,6 @@ public abstract class ScrollbarBundle implements DeferredWorker { /** * Sets the amount of pixels the scrollbar needs to be able to scroll * through. - *

- * Note: Even though {@code double} values are used, they are - * currently only used as integers as large {@code int} (or small but fast - * {@code long}). This means, all values are truncated to zero decimal - * places. * * @param px * the number of pixels the scrollbar should be able to scroll @@ -727,7 +717,7 @@ public abstract class ScrollbarBundle implements DeferredWorker { * @return true iff the scrollbar's handle is visible */ public boolean showsScrollHandle() { - return getOffsetSize() < getScrollSize(); + return getScrollSize() - getOffsetSize() > WidgetUtil.PIXEL_EPSILON; } public void recalculateMaxScrollPos() { -- cgit v1.2.3