8244421: Wrong scrollbar position on touch enabled devices

Reviewed-by: jvos, aghaisas
openjdk · May 8, 2020 · 236e2d6 · 236e2d6
1 parent 0385563
commit 236e2d6
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/modules/javafx.controls/src/main/java/javafx/scene/control/skin/VirtualFlow.java b/modules/javafx.controls/src/main/java/javafx/scene/control/skin/VirtualFlow.java
@@ -2348,8 +2348,13 @@ private void updateViewportDimensions() {
         final double breadthBarLength = isVertical ? snapSizeY(hbar.prefHeight(-1)) : snapSizeX(vbar.prefWidth(-1));
         final double lengthBarBreadth = isVertical ? snapSizeX(vbar.prefWidth(-1)) : snapSizeY(hbar.prefHeight(-1));
 
-        setViewportBreadth((isVertical ? getWidth() : getHeight()) - (needLengthBar ? lengthBarBreadth : 0));
-        setViewportLength((isVertical ? getHeight() : getWidth()) - (needBreadthBar ? breadthBarLength : 0));
+        if (!Properties.IS_TOUCH_SUPPORTED) {
+            setViewportBreadth((isVertical ? getWidth() : getHeight()) - (needLengthBar ? lengthBarBreadth : 0));
+            setViewportLength((isVertical ? getHeight() : getWidth()) - (needBreadthBar ? breadthBarLength : 0));
+        } else {
+            setViewportBreadth((isVertical ? getWidth() : getHeight()));
+            setViewportLength((isVertical ? getHeight() : getWidth()));
+        }
     }
 
     private void initViewport() {