diff --git a/appveyor.yml b/appveyor.yml index 42bde5a..52cd5f1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,7 +2,7 @@ version: "{branch} {build}" environment: - JAVA_HOME: C:\Program Files\Java\jdk1.8.0 + JAVA_HOME: C:\Program Files\Java\jdk9 matrix: - JAVA_OPTS: "" - JAVA_OPTS: "-Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.order=sw -Dprism.text=t2k -Dtestfx.setup.timeout=2500" diff --git a/src/main/java/org/fxmisc/flowless/VirtualizedScrollPane.java b/src/main/java/org/fxmisc/flowless/VirtualizedScrollPane.java index 8007200..1b71fbf 100644 --- a/src/main/java/org/fxmisc/flowless/VirtualizedScrollPane.java +++ b/src/main/java/org/fxmisc/flowless/VirtualizedScrollPane.java @@ -269,12 +269,12 @@ protected double computeMaxHeight(double width) { @Override protected void layoutChildren() { - double layoutWidth = snapSize(getLayoutBounds().getWidth()); - double layoutHeight = snapSize(getLayoutBounds().getHeight()); + double layoutWidth = snapSizeX(getLayoutBounds().getWidth()); + double layoutHeight = snapSizeY(getLayoutBounds().getHeight()); boolean vbarVisible = vbar.isVisible(); boolean hbarVisible = hbar.isVisible(); - double vbarWidth = snapSize(vbarVisible ? vbar.prefWidth(-1) : 0); - double hbarHeight = snapSize(hbarVisible ? hbar.prefHeight(-1) : 0); + double vbarWidth = snapSizeY(vbarVisible ? vbar.prefWidth(-1) : 0); + double hbarHeight = snapSizeX(hbarVisible ? hbar.prefHeight(-1) : 0); double w = layoutWidth - vbarWidth; double h = layoutHeight - hbarHeight;