summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorTeemu Suo-Anttila <teemusa@vaadin.com>2016-01-07 15:45:26 +0200
committerVaadin Code Review <review@vaadin.com>2016-01-08 11:12:06 +0000
commitc390b386ad0da0e0eac29665f0db77bd30cb5e5f (patch)
tree945662a9f1ec4b88b72fb1863a566c18d33aae01 /client
parentabeca5b8491dccef620e3f20c20e7cdf7972681c (diff)
downloadvaadin-framework-c390b386ad0da0e0eac29665f0db77bd30cb5e5f.tar.gz
vaadin-framework-c390b386ad0da0e0eac29665f0db77bd30cb5e5f.zip
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
Diffstat (limited to 'client')
-rw-r--r--client/src/com/vaadin/client/widget/escalator/ScrollbarBundle.java14
1 files changed, 2 insertions, 12 deletions
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.
- * <p>
- * <em>Note:</em> 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.
- * <p>
- * <em>Note:</em> 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 <code>true</code> iff the scrollbar's handle is visible
*/
public boolean showsScrollHandle() {
- return getOffsetSize() < getScrollSize();
+ return getScrollSize() - getOffsetSize() > WidgetUtil.PIXEL_EPSILON;
}
public void recalculateMaxScrollPos() {